Skip to content

Update Ubuntu verison for CI #89

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

Merged
robbr48 merged 2 commits into from
May 6, 2025
Merged

Update Ubuntu verison for CI #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53a550c
Update Ubuntu verison for CI
robbr48 Apr 28, 2025
492f357
Fix minor errors in Python test files
robbr48 May 6, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/ci-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:

cmake-ubuntu:
timeout-minutes: 5
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-python@v5
with:
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:

cmake-ubuntu-python:
timeout-minutes: 5
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-python@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion fmi4c.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def __init__(self):
self.hdll.fmi1_getModelTypesPlatform.restype = ct.c_char_p
self.hdll.fmi1_getModelTypesPlatform.argtypes = ct.c_void_p,
self.hdll.fmi1_instantiateModel.restype = ct.c_void_p
self.hdll.fmi1_instantiateModel.argtypes = ct.c_void_p,ct.c_void_p,ct.c_void_p,ct.c_bool,
self.hdll.fmi1_instantiateModel.argtypes = ct.c_void_p,ct.c_void_p,ct.c_void_p,ct.c_void_p,ct.c_bool,
self.hdll.fmi1_freeModelInstance.restype = None
self.hdll.fmi1_freeModelInstance.argtypes = ct.c_void_p,
self.hdll.fmi1_setTime.restype = ct.c_int
Expand Down
4 changes: 2 additions & 2 deletions test/pytest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,11 @@ def verify(name, value):
verify("version", version)

instance = 0
instance = instantiateSuccess = f.fmi1_instantiateSlave(b"application/x-fmu-sharedlibrary", 1.0, False, False, False)
instance = f.fmi1_instantiateSlave(b"application/x-fmu-sharedlibrary", 1.0, False, False, False)
verify("instantiateSuccess", instance != 0)

instance2 = 0
instance2 = instantiateSuccess = f.fmi1_instantiateSlave(b"application/x-fmu-sharedlibrary", 1.0, False, False, False)
instance2 = f.fmi1_instantiateSlave(b"application/x-fmu-sharedlibrary", 1.0, False, False, False)
verify("instantiateSuccess", instance2 != 0)

setDebugLoggingSuccess = f.fmi1_setDebugLogging(instance, True)
Expand Down