From 2330fae8425aae5d691f4a677580e1cb801902ab Mon Sep 17 00:00:00 2001 From: Shannon Weyrick Date: Mon, 15 Mar 2021 20:29:55 -0400 Subject: [PATCH 1/2] osx github ci conan workaround: install outside of cmake --- .github/workflows/cmake.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 9f99baf6c..36be21c95 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -43,22 +43,22 @@ jobs: run: | conan profile new --detect default - - name: Conan profile (linux) + - name: Conan profile (linux-workaround) if: matrix.os == 'ubuntu-latest' run: conan profile update settings.compiler.libcxx=libstdc++11 default + - name: Conan install (osx-workaround) + if: matrix.os == 'macos-latest' + working-directory: ${{github.workspace}}/build + run: conan install --build=missing .. + - name: linux package install if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update sudo apt-get install --yes --no-install-recommends golang ca-certificates jq - - name: osx package install - if: matrix.os == 'macos-latest' - run: | - brew update - - name: Configure CMake # Use a bash shell so we can use the same syntax for environment variable # access regardless of the host operating system From b6834865d42ceefd49829f7c1ac5704de827eb7c Mon Sep 17 00:00:00 2001 From: Shannon Weyrick Date: Tue, 16 Mar 2021 06:56:39 -0400 Subject: [PATCH 2/2] osx ci --- .github/workflows/cmake.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 36be21c95..03f6b294f 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -51,7 +51,9 @@ jobs: - name: Conan install (osx-workaround) if: matrix.os == 'macos-latest' working-directory: ${{github.workspace}}/build - run: conan install --build=missing .. + run: | + conan remote add public-conan https://api.bintray.com/conan/bincrafters/public-conan + conan install --build=missing .. - name: linux package install if: matrix.os == 'ubuntu-latest'