From ff49e3dde8f11de13b395def994eb1cbc21d56ed Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Mon, 18 May 2026 13:04:21 +0200 Subject: [PATCH 01/12] Update CI configuration and dependencies for libcosimc --- .github/workflows/ci-conan.yml | 43 +++++++++++++++------------------- conanfile.py | 4 ++-- version.txt | 2 +- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index e54bb0b..dc91d76 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -11,30 +11,29 @@ jobs: fail-fast: false matrix: build_type: [Debug, Release] - compiler_version: [9] + compiler_version: [14] option_shared: ['shared=True', 'shared=False'] option_proxyfmu: ['proxyfmu=True', 'proxyfmu=False'] - + container: + image: gcc:${{ matrix.compiler_version }} + env: + CONAN_LOGIN_USERNAME_OSP: ${{ secrets.osp_artifactory_usr }} + CONAN_PASSWORD_OSP: ${{ secrets.osp_artifactory_pwd }} + LIBCOSIMC_RUN_TESTS_ON_CONAN_BUILD: 1 steps: - uses: actions/checkout@v4 - - name: Generate Dockerfile + - name: Install prerequisites run: | - mkdir /tmp/osp-builder-docker - cat <<'EOF' >/tmp/osp-builder-docker/Dockerfile - FROM conanio/gcc${{ matrix.compiler_version }}-ubuntu16.04 - ENV CONAN_LOGIN_USERNAME_OSP=${{ secrets.osp_artifactory_usr }} - ENV CONAN_PASSWORD_OSP=${{ secrets.osp_artifactory_pwd }} - ENV LIBCOSIMC_RUN_TESTS_ON_CONAN_BUILD=1 - COPY entrypoint.sh / - ENTRYPOINT /entrypoint.sh - EOF + apt-get update + apt-get install -y pipx doxygen + pipx install conan + echo "$HOME/.local/bin" >> "$GITHUB_PATH" + - name: Configure Conan + run: | + conan profile detect + conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local - name: Generate entrypoint.sh run: | - cat <<'EOF' >/tmp/osp-builder-docker/entrypoint.sh - #!/bin/bash -v - set -eu - cd /mnt/source - conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force REFNAME="${GITHUB_REF#refs/*/}" VERSION="v$(=3.15]", + "cmake/[>=4.0]", "doxygen/1.9.1", ) requires = ( - "libcosim/0.11.0@osp/stable", + "libcosim/0.11.2@osp/stable", ) # Exports diff --git a/version.txt b/version.txt index af88ba8..bc859cb 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.11.1 +0.11.2 From c1c644f6e69d221a20f24fb75c7210108cd21347 Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Mon, 18 May 2026 13:08:06 +0200 Subject: [PATCH 02/12] Update CI configuration for Conan create process --- .github/workflows/ci-conan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index dc91d76..d2119be 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -32,7 +32,7 @@ jobs: run: | conan profile detect conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local - - name: Generate entrypoint.sh + - name: Conan create run: | REFNAME="${GITHUB_REF#refs/*/}" VERSION="v$( Date: Mon, 18 May 2026 13:24:40 +0200 Subject: [PATCH 03/12] Fix CI configuration by ensuring bash shell is used for Conan create step --- .github/workflows/ci-conan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index d2119be..1873586 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -33,6 +33,7 @@ jobs: conan profile detect conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local - name: Conan create + shell: bash run: | REFNAME="${GITHUB_REF#refs/*/}" VERSION="v$( Date: Mon, 18 May 2026 14:23:35 +0200 Subject: [PATCH 04/12] Update CI configuration to install CMake and enforce bash shell for Conan create step --- .github/workflows/ci-conan.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 1873586..0687eee 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -26,7 +26,7 @@ jobs: run: | apt-get update apt-get install -y pipx doxygen - pipx install conan + pipx install conan cmake echo "$HOME/.local/bin" >> "$GITHUB_PATH" - name: Configure Conan run: | @@ -81,6 +81,7 @@ jobs: conan profile detect conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force - name: Conan create + shell: bash run: | REFNAME="${GITHUB_REF#refs/*/}" VERSION="v$( Date: Mon, 18 May 2026 14:29:57 +0200 Subject: [PATCH 05/12] Updated --- .github/workflows/ci-conan.yml | 2 +- conanfile.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 0687eee..f8bff3b 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -26,7 +26,7 @@ jobs: run: | apt-get update apt-get install -y pipx doxygen - pipx install conan cmake + pipx install conan echo "$HOME/.local/bin" >> "$GITHUB_PATH" - name: Configure Conan run: | diff --git a/conanfile.py b/conanfile.py index 1e4e690..b2258b1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -41,7 +41,6 @@ def configure(self): # Dependencies/requirements tool_requires = ( - "cmake/[>=4.0]", "doxygen/1.9.1", ) requires = ( @@ -55,6 +54,9 @@ def configure(self): # Build steps generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv" + def requirements(self): + self.tool_requires("cmake/[>=4.0]") + def layout(self): cmake_layout(self) From 88959061913458660d2aa63896879e51228611b1 Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Mon, 18 May 2026 14:46:36 +0200 Subject: [PATCH 06/12] Update Doxygen dependency to version 1.17.0 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index b2258b1..5efc1dc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -41,7 +41,7 @@ def configure(self): # Dependencies/requirements tool_requires = ( - "doxygen/1.9.1", + "doxygen/1.17.0", ) requires = ( "libcosim/0.11.2@osp/stable", From c9fcc9357aada3ee8057091c27708607e1df44ce Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Mon, 18 May 2026 15:03:47 +0200 Subject: [PATCH 07/12] Remove Doxygen installation from CI configuration --- .github/workflows/ci-conan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index f8bff3b..7e227db 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -25,7 +25,7 @@ jobs: - name: Install prerequisites run: | apt-get update - apt-get install -y pipx doxygen + apt-get install -y pipx pipx install conan echo "$HOME/.local/bin" >> "$GITHUB_PATH" - name: Configure Conan From 7cb10b5ae1f420b942b9ac2f9158ccd325c8819c Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Mon, 18 May 2026 15:12:00 +0200 Subject: [PATCH 08/12] Update compiler version in CI configuration from 14 to 13 --- .github/workflows/ci-conan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 7e227db..380f292 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: build_type: [Debug, Release] - compiler_version: [14] + compiler_version: [13] option_shared: ['shared=True', 'shared=False'] option_proxyfmu: ['proxyfmu=True', 'proxyfmu=False'] container: From 26fa397d006a3214d88b8153c41672d89d14d2ab Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Mon, 18 May 2026 15:30:51 +0200 Subject: [PATCH 09/12] Update CI configuration to install CMake and add CMake as a tool requirement in conanfile --- .github/workflows/ci-conan.yml | 2 +- conanfile.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 380f292..eb7c268 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -26,7 +26,7 @@ jobs: run: | apt-get update apt-get install -y pipx - pipx install conan + pipx install conan cmake>=4.0 echo "$HOME/.local/bin" >> "$GITHUB_PATH" - name: Configure Conan run: | diff --git a/conanfile.py b/conanfile.py index 5efc1dc..62c645d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -41,6 +41,7 @@ def configure(self): # Dependencies/requirements tool_requires = ( + "cmake/[>=4.0]", "doxygen/1.17.0", ) requires = ( @@ -54,9 +55,6 @@ def configure(self): # Build steps generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv" - def requirements(self): - self.tool_requires("cmake/[>=4.0]") - def layout(self): cmake_layout(self) From 2568caf82fa6f02eb676db9d5ec51bc5ba4e0dfd Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Mon, 18 May 2026 15:33:05 +0200 Subject: [PATCH 10/12] Fix syntax for CMake version specification in CI configuration --- .github/workflows/ci-conan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index eb7c268..d73c175 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -26,7 +26,7 @@ jobs: run: | apt-get update apt-get install -y pipx - pipx install conan cmake>=4.0 + pipx install conan "cmake>=4.0" echo "$HOME/.local/bin" >> "$GITHUB_PATH" - name: Configure Conan run: | From a6e253266083887c41a05add0a9e346c1353f62b Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Mon, 18 May 2026 15:36:05 +0200 Subject: [PATCH 11/12] Update CI configuration to install CMake without version constraint --- .github/workflows/ci-conan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index d73c175..3467e31 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -26,7 +26,7 @@ jobs: run: | apt-get update apt-get install -y pipx - pipx install conan "cmake>=4.0" + pipx install conan cmake echo "$HOME/.local/bin" >> "$GITHUB_PATH" - name: Configure Conan run: | From b229ccf5557041130d585e6318e9d4ec664ffd75 Mon Sep 17 00:00:00 2001 From: Hee Jong Park Date: Mon, 18 May 2026 15:41:02 +0200 Subject: [PATCH 12/12] Remove Doxygen dependency from tool requirements and update compiler version in CI configuration --- .github/workflows/ci-conan.yml | 4 ++-- conanfile.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 3467e31..0687eee 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: build_type: [Debug, Release] - compiler_version: [13] + compiler_version: [14] option_shared: ['shared=True', 'shared=False'] option_proxyfmu: ['proxyfmu=True', 'proxyfmu=False'] container: @@ -25,7 +25,7 @@ jobs: - name: Install prerequisites run: | apt-get update - apt-get install -y pipx + apt-get install -y pipx doxygen pipx install conan cmake echo "$HOME/.local/bin" >> "$GITHUB_PATH" - name: Configure Conan diff --git a/conanfile.py b/conanfile.py index 62c645d..c5a3b74 100644 --- a/conanfile.py +++ b/conanfile.py @@ -42,7 +42,6 @@ def configure(self): # Dependencies/requirements tool_requires = ( "cmake/[>=4.0]", - "doxygen/1.17.0", ) requires = ( "libcosim/0.11.2@osp/stable",