Skip to content

Using proxyfmu/0.4.1 that uses increased frame size #789

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
davidhjp01 merged 15 commits into from
May 15, 2025
Merged

Using proxyfmu/0.4.1 that uses increased frame size #789

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
898991e
Using updated proxyfmu
davidhjp01 May 12, 2025
096bd8d
Conan update
davidhjp01 May 12, 2025
0ff748c
Conan update
davidhjp01 May 12, 2025
888002b
Using proxyfmu/0.4.1
davidhjp01 May 14, 2025
904405d
Using proxyfmu/0.4.1
davidhjp01 May 14, 2025
4bfdec0
Using proxyfmu/0.4.1
davidhjp01 May 14, 2025
fb87fce
Using proxyfmu/0.4.1
davidhjp01 May 14, 2025
94cbf1d
Trying to use system libcbor in cmake test
davidhjp01 May 15, 2025
466ae4d
Trying to use system libcbor in cmake test
davidhjp01 May 15, 2025
8a361dd
Trying to use system libcbor in cmake test
davidhjp01 May 15, 2025
791d10c
Trying to use system libcbor in cmake test
davidhjp01 May 15, 2025
66f9ca2
Trying to use system libcbor in cmake test
davidhjp01 May 15, 2025
0ae2236
Trying to use system libcbor in cmake test
davidhjp01 May 15, 2025
c1a1247
Trying to use system libcbor in cmake test
davidhjp01 May 15, 2025
c1b98ad
Trying to use system libcbor in cmake test
davidhjp01 May 15, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci-cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
libmsgsl-dev \
libyaml-cpp-dev \
libxerces-c-dev \
libzip-dev zipcmp zipmerge ziptool
libzip-dev zipcmp zipmerge ziptool libcbor-dev
RUN wget \
--no-check-certificate \
"https://github.com/viproma/debian-fmilib/releases/download/debian%2F2.0.3-1/libfmilib2_2.0.3-1_amd64.deb" \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-conan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
#!/bin/bash -v
set -eu
cd /mnt/source
pip install conan --upgrade
conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
REFNAME="${GITHUB_REF#refs/*/}"
VERSION="v$(<version.txt)"
Expand All @@ -50,6 +51,7 @@ jobs:
--options="${{ matrix.option_shared }}" \
--update \
--build=missing \
--build=b2/* \
Copy link
Contributor Author

@davidhjp01 davidhjp01 May 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

b2 from conancenter uses "modern" GLIBC and fails linking on our build. Rebuilding it until b2 supports --build=compatible:[pattern].

--user=osp \
--channel="${CHANNEL}" \
.
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def requirements(self):
self.requires("ms-gsl/[>=3 <5]", transitive_headers=True)
self.requires("boost/[~1.85]", transitive_headers=True, transitive_libs=True) # Required by Thrift
if self.options.proxyfmu:
self.requires("proxyfmu/0.3.3@osp/testing",
self.requires("proxyfmu/0.4.1@osp/stable",
transitive_headers=True,
transitive_libs=True)
self.requires("yaml-cpp/[~0.8]")
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.0
0.11.1