From f019d312fc2ba135bc0d73ad7c605a4608867201 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 5 Mar 2023 13:15:17 -0800 Subject: [PATCH 1/2] github CI: update conan Signed-off-by: Rosen Penev --- .github/workflows/on_PR_windows_matrix.yml | 2 +- .github/workflows/on_push_BasicWinLinMac.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml index 7d21e16152..e110713232 100644 --- a/.github/workflows/on_PR_windows_matrix.yml +++ b/.github/workflows/on_PR_windows_matrix.yml @@ -45,7 +45,7 @@ jobs: - name: Install Conan & Common config run: | - python -m pip install conan==1.55.0 + python -m pip install conan==1.59.0 conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile update settings.build_type=${{matrix.build_type}} default diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index 5dfdd2c172..f901626a57 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -35,7 +35,7 @@ jobs: - name: Install Conan & Common config run: | - python -m pip install conan==1.55.0 + python -m pip install conan==1.59.0 conan profile new --detect default conan profile show default conan profile update settings.compiler="Visual Studio" default diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c595050fd..94ccb7c308 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies run: | sudo apt install -y gettext doxygen graphviz - python -m pip install conan==1.55.0 ninja + python -m pip install conan==1.59.0 ninja - name: Conan common config run: | From 37dde9eb46ba56ed11b801b07bcb41013af745ab Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 5 Mar 2023 13:37:11 -0800 Subject: [PATCH 2/2] github CI: remove NoConan Signed-off-by: Rosen Penev --- .github/workflows/on_PR_linux_staticAnalysis.yml | 2 +- .github/workflows/on_push_BasicWinLinMac.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on_PR_linux_staticAnalysis.yml b/.github/workflows/on_PR_linux_staticAnalysis.yml index 2fbbd88390..1b2fd7df28 100644 --- a/.github/workflows/on_PR_linux_staticAnalysis.yml +++ b/.github/workflows/on_PR_linux_staticAnalysis.yml @@ -44,7 +44,7 @@ jobs: - name: Configure run: | - cmake --preset linux-debug-NoConan -S . -B build -DCMAKE_EXPORT_COMPILE_COMMANDS=ON + cmake --preset linux-debug -S . -B build -DCMAKE_EXPORT_COMPILE_COMMANDS=ON - name: Static Analysis env: diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index f901626a57..0db9dea315 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -62,7 +62,7 @@ jobs: - name: install dependencies run: | - python3 -m pip install conan==1.55.0 ninja + python3 -m pip install conan==1.59.0 ninja - name: Conan run: | @@ -74,7 +74,7 @@ jobs: - name: build and compile run: | - cmake --preset linux-release-NoConan -S . -B build + cmake --preset linux-release -S . -B build cmake --build build --parallel - name: Test