From c9638bb36b95171908aee3e5f6fad0b846c45eaa Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Mon, 4 Oct 2021 11:49:55 +0100 Subject: [PATCH 1/2] Fix Conan on macOS --- .github/workflows/on_push_BasicWinLinMac.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index c63a493ec6..cd26488ce7 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -102,6 +102,7 @@ jobs: - name: Conan run: | mkdir build && cd build + conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile show default conan install .. -o webready=True --build missing From a0cff1258cd2ddf2fda811b4013e6ff377985554 Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Mon, 4 Oct 2021 11:52:54 +0100 Subject: [PATCH 2/2] Use same Conan version on macOS as on other platforms. --- .github/workflows/on_PR_mac_matrix.yml | 4 ++-- .github/workflows/on_push_BasicWinLinMac.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/on_PR_mac_matrix.yml b/.github/workflows/on_PR_mac_matrix.yml index 82b2eb67d7..61da96f619 100644 --- a/.github/workflows/on_PR_mac_matrix.yml +++ b/.github/workflows/on_PR_mac_matrix.yml @@ -3,7 +3,7 @@ name: Mac Matrix on PRs on: [pull_request] jobs: - windows: + MacOS: name: 'MacOS - clang, BuildType:${{matrix.build_type}}, SHARED:${{matrix.shared_libraries}}' runs-on: macos-latest @@ -19,7 +19,7 @@ jobs: - name: install dependencies run: | brew install ninja - pip3 install conan==1.36.0 + pip3 install conan==1.39.0 - name: Run Conan run: | diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index cd26488ce7..91a0638823 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -97,7 +97,7 @@ jobs: - name: install dependencies run: | brew install ninja - pip3 install conan==1.36.0 + pip3 install conan==1.39.0 - name: Conan run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 12e9c767f4..c56b52c440 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,7 @@ jobs: brew install ninja brew install tree brew install gettext - pip3 install conan==1.36.0 + pip3 install conan==1.39.0 brew install doxygen brew install graphviz