From a6dd2056da608f20aa983d0b7d4cd6cc5a65c1e2 Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Tue, 29 Oct 2024 11:14:32 +0100 Subject: [PATCH 1/6] Build with macOS 13 in CI --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 647897e0..4c7266c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,10 +32,10 @@ jobs: image: ubuntu-20.04 arch: aarch64 - name: x86_64-darwin - image: macos-12 + image: macos-13 arch: x86_64 - name: aarch64-darwin - image: macos-12 + image: macos-13 arch: aarch64 runs-on: ${{ matrix.image }} needs: lint-files From ff9b9378d5295387f3f365f8ba102119e1d84c24 Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Tue, 29 Oct 2024 11:28:34 +0100 Subject: [PATCH 2/6] Remove s-weigand/setup-conda action --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c7266c2..622d7b36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,10 +44,6 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.10' - - uses: s-weigand/setup-conda@v1 - with: - conda-channels: conda-forge - - run: conda --version - run: which python - run: python -m pip install fmpy==0.3.20 pytest scipy - if: matrix.name == 'aarch64-linux' From a8572905c4ebd3f1bf9181e3454d72428454f66b Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Tue, 29 Oct 2024 11:29:04 +0100 Subject: [PATCH 3/6] Use FMPy 0.3.21 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 622d7b36..bebf8148 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: with: python-version: '3.10' - run: which python - - run: python -m pip install fmpy==0.3.20 pytest scipy + - run: python -m pip install fmpy==0.3.21 pytest scipy - if: matrix.name == 'aarch64-linux' run: | sudo apt-get update From 84cc3da39b409ed03bfe92bd9de663f0bd262b42 Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Tue, 29 Oct 2024 11:33:51 +0100 Subject: [PATCH 4/6] Install requests --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bebf8148..b48c3a98 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: with: python-version: '3.10' - run: which python - - run: python -m pip install fmpy==0.3.21 pytest scipy + - run: python -m pip install fmpy==0.3.21 pytest requests scipy - if: matrix.name == 'aarch64-linux' run: | sudo apt-get update From c3bc44c330763b83735005b56579e708cee26b7a Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Tue, 29 Oct 2024 11:39:09 +0100 Subject: [PATCH 5/6] Add missing "void" argument to fmi1*() functions --- include/fmi1Functions.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/fmi1Functions.h b/include/fmi1Functions.h index 503542e7..0a4233ae 100644 --- a/include/fmi1Functions.h +++ b/include/fmi1Functions.h @@ -84,8 +84,8 @@ typedef fmi1Status fmi1SetDebugLoggingTYPE (fmi1Component c, fmi1Boolean logg /*************************************************** FMI 1.0 for Model Exchange Functions ****************************************************/ -typedef const char* fmi1GetModelTypesPlatformTYPE (); -typedef const char* fmi1GetVersionTYPE (); +typedef const char* fmi1GetModelTypesPlatformTYPE (void); +typedef const char* fmi1GetVersionTYPE (void); typedef fmi1Component fmi1InstantiateModelTYPE (fmi1String instanceName, fmi1String GUID, fmi1CallbackFunctions functions, fmi1Boolean loggingOn); typedef void fmi1FreeModelInstanceTYPE (fmi1Component c); typedef fmi1Status fmi1SetTimeTYPE (fmi1Component c, fmi1Real time); @@ -103,7 +103,7 @@ typedef fmi1Status fmi1TerminateTYPE (fmi1Component c); /*************************************************** FMI 1.0 for Co-Simulation Functions ****************************************************/ -typedef const char* fmi1GetTypesPlatformTYPE (); +typedef const char* fmi1GetTypesPlatformTYPE (void); typedef fmi1Component fmi1InstantiateSlaveTYPE (fmi1String instanceName, fmi1String fmuGUID, fmi1String fmuLocation,fmi1String mimeType, fmi1Real timeout, fmi1Boolean visible, fmi1Boolean interactive, fmi1CallbackFunctions functions, fmi1Boolean loggingOn); typedef fmi1Status fmi1InitializeSlaveTYPE (fmi1Component c, fmi1Real tStart, fmi1Boolean StopTimeDefined, fmi1Real tStop); typedef fmi1Status fmi1TerminateSlaveTYPE (fmi1Component c); From 9d3cd3ccc073cfdb53c11382cc8bcbbd4811e05a Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Tue, 29 Oct 2024 11:47:10 +0100 Subject: [PATCH 6/6] Add more missing "void" argument to fmi1*() functions --- include/fmiFunctions.h | 4 ++-- src/fmi1Functions.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/fmiFunctions.h b/include/fmiFunctions.h index 73e2a1c9..bdc85671 100644 --- a/include/fmiFunctions.h +++ b/include/fmiFunctions.h @@ -162,8 +162,8 @@ Common Functions ****************************************************/ /* Inquire version numbers of header files */ - DllExport const char* fmiGetTypesPlatform(); - DllExport const char* fmiGetVersion(); + DllExport const char* fmiGetTypesPlatform(void); + DllExport const char* fmiGetVersion(void); DllExport fmiStatus fmiSetDebugLogging (fmiComponent c, fmiBoolean loggingOn); diff --git a/src/fmi1Functions.c b/src/fmi1Functions.c index d35758fa..122ef7e3 100644 --- a/src/fmi1Functions.c +++ b/src/fmi1Functions.c @@ -190,7 +190,7 @@ fmiStatus fmiGetString(fmiComponent c, const fmiValueReference vr[], size_t nvr, // FMI functions: only for FMI Co-Simulation 1.0 // --------------------------------------------------------------------------- -const char* fmiGetTypesPlatform() { +const char* fmiGetTypesPlatform(void) { return fmiPlatform; }