Build with macOS 13 in CI (#624)

* Build with macOS 13 in CI * Remove s-weigand/setup-conda action * Use FMPy 0.3.21 * Install requests * Add missing "void" argument to fmi1*() functions * Add more missing "void" argument to fmi1*() functions
modelica · Oct 29, 2024 · 5ee1956 · 5ee1956
1 parent 09173a5
commit 5ee1956
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git 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
@@ -44,12 +44,8 @@ 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
+    - run: python -m pip install fmpy==0.3.21 pytest requests scipy
     - if: matrix.name == 'aarch64-linux'
       run: |
         sudo apt-get update

diff --git 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);

diff --git 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
@@ -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;
 }