Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build with macOS 13 in CI #624

Merged
merged 6 commits into from
Oct 29, 2024
Merged

Build with macOS 13 in CI #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a6dd205
Build with macOS 13 in CI
t-sommer Oct 29, 2024
ff9b937
Remove s-weigand/setup-conda action
t-sommer Oct 29, 2024
a857290
Use FMPy 0.3.21
t-sommer Oct 29, 2024
84cc3da
Install requests
t-sommer Oct 29, 2024
c3bc44c
Add missing "void" argument to fmi1*() functions
t-sommer Oct 29, 2024
9d3cd3c
Add more missing "void" argument to fmi1*() functions
t-sommer Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/fmi1Functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions include/fmiFunctions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/fmi1Functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down