diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml index 69f0d33630..f95d261f06 100644 --- a/.github/workflows/linux_server_build.yml +++ b/.github/workflows/linux_server_build.yml @@ -287,16 +287,6 @@ jobs: conan install . -s compiler.cppstd=$CONAN_CPPSTD -s build_type=$BUILD_TYPE -o '&:with_qt='${CONAN_QT^} -b missing -pr:b=default -of build --format=json > build.json done - - name: Upload Conan dependencies - continue-on-error: true - shell: bash - env: - CONAN_LOGIN_USERNAME_OVERTE: ${{ secrets.conan_login_username_overte }} - CONAN_PASSWORD_OVERTE: ${{ secrets.conan_password_overte }} - run: | - conan list --graph=build.json --graph-binaries=build --format=json > pkglist.json - conan upload --list=pkglist.json -r=overte -c || echo "Credentials cannot be accessed on remote Pull Request builds. Continuing…" - - name: Configure CMake shell: bash # This syntax requires CMake 3.23 diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index cdac19eab6..33c96a76f6 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -188,6 +188,9 @@ jobs: done - name: Upload Conan dependencies + # Conan isn't glibc aware, so we need to be really careful what we upload to the binary cache on Linux. + # See the upstream discussion: https://github.com/conan-io/conan/issues/7121 + if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS') continue-on-error: true shell: bash env: diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index afc0665135..9619351120 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -245,6 +245,9 @@ jobs: done - name: Upload Conan dependencies + # Conan isn't glibc aware, so we need to be really careful what we upload to the binary cache on Linux. + # See the upstream discussion: https://github.com/conan-io/conan/issues/7121 + if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS') continue-on-error: true shell: bash env: diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index fbc9aab022..da92e342fd 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -112,6 +112,9 @@ jobs: done - name: Upload Conan dependencies + # Conan isn't glibc aware, so we need to be really careful what we upload to the binary cache on Linux. + # See the upstream discussion: https://github.com/conan-io/conan/issues/7121 + if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS') continue-on-error: true shell: bash env: