From a73f5b74489fcabb66b1ab92d484983e63dd25be Mon Sep 17 00:00:00 2001 From: Roger Eivind Stenbro Date: Thu, 12 Dec 2024 13:16:43 +0100 Subject: [PATCH 1/3] bump to @v4 upload-artifact --- .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 0eda638..5a5c604 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -45,7 +45,7 @@ jobs: mkdir -m 0777 build docker run --rm -v $(pwd):/mnt/source osp-builder - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.compiler_version }}-${{ matrix.option_proxyfmu }} path: build/${{ matrix.build_type }}/dist @@ -77,7 +77,7 @@ jobs: cmake --build build --config ${{ matrix.build_type }} cmake --build build --config ${{ matrix.build_type }} --target install - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.option_proxyfmu }} path: build/dist From 9ed6c456cd217eefc7d487ba5b099cf24917b6ef Mon Sep 17 00:00:00 2001 From: Roger Eivind Stenbro Date: Thu, 12 Dec 2024 13:17:58 +0100 Subject: [PATCH 2/3] add overwrite flag --- .github/workflows/ci-conan.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 5a5c604..b83c7ee 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -49,6 +49,7 @@ jobs: with: name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.compiler_version }}-${{ matrix.option_proxyfmu }} path: build/${{ matrix.build_type }}/dist + overwrite: true windows: name: Windows @@ -81,3 +82,4 @@ jobs: with: name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.option_proxyfmu }} path: build/dist + overwrite: true From 099e78d0e6bdd1cd17420ddf816661a54325f290 Mon Sep 17 00:00:00 2001 From: Roger Eivind Stenbro Date: Thu, 12 Dec 2024 17:16:02 +0100 Subject: [PATCH 3/3] also bump libcosim version --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 7635e79..bbae563 100644 --- a/conanfile.py +++ b/conanfile.py @@ -13,7 +13,7 @@ def requirements(self): self.tool_requires("cmake/[>=3.19]") if self.settings.os == "Linux": self.tool_requires("patchelf/[<0.18]") - self.requires("libcosim/0.10.3@osp/stable") + self.requires("libcosim/0.10.4@osp/stable") self.requires("boost/[>=1.71]") def layout(self):