From bc1e8ac3ed9e8160c34349af667635eaab3215fa Mon Sep 17 00:00:00 2001 From: "Jonathan Thorpe (Sony)" Date: Fri, 21 Jun 2024 13:29:58 +0100 Subject: [PATCH 1/2] Updated Conan version to handle upgraded MSVC compiler on GitHub instance --- .github/workflows/build-test.yml | 4 ++-- .github/workflows/src/build-setup.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index e6704fbf..ffa15c17 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -121,7 +121,7 @@ jobs: - name: install conan if: matrix.use_conan == true run: | - pip install conan~=2.0.5 + pip install conan~=2.4.1 - name: 'ubuntu-14.04: install cmake' if: matrix.os == 'ubuntu-14.04' @@ -1184,4 +1184,4 @@ jobs: git config --global user.name 'test-results-uploader' git config --global user.email 'test-results-uploader@nmos-cpp.iam.gserviceaccount.com' git commit -qm "Badges for README at ${{ env.GITHUB_COMMIT }}" - git push -f `git remote` badges-${{ env.GITHUB_COMMIT }}:badges \ No newline at end of file + git push -f `git remote` badges-${{ env.GITHUB_COMMIT }}:badges diff --git a/.github/workflows/src/build-setup.yml b/.github/workflows/src/build-setup.yml index 4e2b49f9..525d9554 100644 --- a/.github/workflows/src/build-setup.yml +++ b/.github/workflows/src/build-setup.yml @@ -1,7 +1,7 @@ - name: install conan if: matrix.use_conan == true run: | - pip install conan~=2.0.5 + pip install conan~=2.4.1 - name: 'ubuntu-14.04: install cmake' if: matrix.os == 'ubuntu-14.04' From 9e78963ce360bf7d9caf66577da27079f349a530 Mon Sep 17 00:00:00 2001 From: "Jonathan Thorpe (Sony)" Date: Fri, 21 Jun 2024 15:26:33 +0100 Subject: [PATCH 2/2] Generates build-test.yml --- .github/workflows/build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index ffa15c17..337d7511 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -677,7 +677,7 @@ jobs: - name: install conan if: matrix.use_conan == true run: | - pip install conan~=2.0.5 + pip install conan~=2.4.1 - name: 'ubuntu-14.04: install cmake' if: matrix.os == 'ubuntu-14.04' @@ -1184,4 +1184,4 @@ jobs: git config --global user.name 'test-results-uploader' git config --global user.email 'test-results-uploader@nmos-cpp.iam.gserviceaccount.com' git commit -qm "Badges for README at ${{ env.GITHUB_COMMIT }}" - git push -f `git remote` badges-${{ env.GITHUB_COMMIT }}:badges + git push -f `git remote` badges-${{ env.GITHUB_COMMIT }}:badges \ No newline at end of file