From e6ce13729baeb3508699352744506dde2d20a3d8 Mon Sep 17 00:00:00 2001 From: Kevin Backhouse Date: Fri, 1 Oct 2021 10:32:00 +0100 Subject: [PATCH] Add workaround for conan outage: https://github.com/conan-io/conan/issues/9695 --- .github/workflows/on_PR_linux_matrix.yml | 1 + .github/workflows/on_PR_linux_special_buils.yml | 4 ++++ .github/workflows/on_PR_mac_matrix.yml | 1 + .github/workflows/on_PR_windows_matrix.yml | 1 + .github/workflows/on_push_BasicWinLinMac.yml | 2 ++ .github/workflows/on_push_ExtraJobsForMain.yml | 1 + .github/workflows/release.yml | 2 ++ ci/backup/appveyor_all_vs_versions.yml | 1 + 8 files changed, 13 insertions(+) diff --git a/.github/workflows/on_PR_linux_matrix.yml b/.github/workflows/on_PR_linux_matrix.yml index 56fdfb68..a4405174 100644 --- a/.github/workflows/on_PR_linux_matrix.yml +++ b/.github/workflows/on_PR_linux_matrix.yml @@ -23,6 +23,7 @@ jobs: - name: Conan common config run: | + 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 conan profile update settings.compiler.libcxx=libstdc++11 default diff --git a/.github/workflows/on_PR_linux_special_buils.yml b/.github/workflows/on_PR_linux_special_buils.yml index 81f9e7af..b721ba8f 100644 --- a/.github/workflows/on_PR_linux_special_buils.yml +++ b/.github/workflows/on_PR_linux_special_buils.yml @@ -20,6 +20,7 @@ jobs: - name: Conan common config run: | + conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile update settings.compiler.libcxx=libstdc++11 default @@ -68,6 +69,7 @@ jobs: - name: Conan common config run: | + conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile update settings.compiler.libcxx=libstdc++11 default @@ -106,6 +108,7 @@ jobs: - name: Conan common config run: | + conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile update settings.compiler.libcxx=libstdc++11 default @@ -144,6 +147,7 @@ jobs: - name: Conan common config run: | + conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile update settings.compiler.libcxx=libstdc++11 default diff --git a/.github/workflows/on_PR_mac_matrix.yml b/.github/workflows/on_PR_mac_matrix.yml index 01d3070b..82b2eb67 100644 --- a/.github/workflows/on_PR_mac_matrix.yml +++ b/.github/workflows/on_PR_mac_matrix.yml @@ -24,6 +24,7 @@ jobs: - name: Run 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 diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml index 96ba4094..f9dbddb8 100644 --- a/.github/workflows/on_PR_windows_matrix.yml +++ b/.github/workflows/on_PR_windows_matrix.yml @@ -47,6 +47,7 @@ jobs: - name: Install Conan & Common config run: | pip.exe install "conan==1.39.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 conan config set storage.path=$Env:GITHUB_WORKSPACE/conanCache diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index f2f2e570..c63a493e 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -32,6 +32,7 @@ jobs: - name: Install Conan & Common config run: | pip.exe install "conan==1.39.0" + conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile show default @@ -69,6 +70,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 update settings.compiler.libcxx=libstdc++11 default conan profile show default diff --git a/.github/workflows/on_push_ExtraJobsForMain.yml b/.github/workflows/on_push_ExtraJobsForMain.yml index 5f733620..c731e869 100644 --- a/.github/workflows/on_push_ExtraJobsForMain.yml +++ b/.github/workflows/on_push_ExtraJobsForMain.yml @@ -21,6 +21,7 @@ jobs: - name: Conan common config run: | + conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile update settings.compiler.libcxx=libstdc++11 default diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4e135f3f..2fc2c5b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,6 +29,7 @@ jobs: - name: Conan common config run: | + conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile update settings.build_type=Release default conan profile update settings.compiler.libcxx=libstdc++11 default @@ -127,6 +128,7 @@ jobs: - name: Install Conan & Common config run: | pip.exe install "conan==1.39.0" + conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile update settings.build_type=Release default conan config set storage.path=$Env:GITHUB_WORKSPACE/conanCache diff --git a/ci/backup/appveyor_all_vs_versions.yml b/ci/backup/appveyor_all_vs_versions.yml index 85328021..796cb9af 100644 --- a/ci/backup/appveyor_all_vs_versions.yml +++ b/ci/backup/appveyor_all_vs_versions.yml @@ -47,6 +47,7 @@ install: - cd %APPVEYOR_BUILD_FOLDER% before_build: + - cmd: conan config install https://github.com/conan-io/conanclientcert.git - cmd: conan remote list - cmd: conan config set storage.path=c:\Users\appveyor\conanCache - cmd: conan profile new --detect default