From 6ec08072bad93f034025fe097e2e278fd873a848 Mon Sep 17 00:00:00 2001 From: "Jonathan Thorpe (Sony)" Date: Wed, 4 Dec 2024 17:24:57 +0000 Subject: [PATCH] Don't use get-cmake for Ubuntu 14.04 --- .github/workflows/build-test.yml | 8 ++++++-- .github/workflows/src/build.yml | 1 + .github/workflows/src/install-test.yml | 2 +- .github/workflows/src/install.yml | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 97752b8ec..cdfa2ce69 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -311,6 +311,7 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 - name: build + if: matrix.os != 'ubuntu-14.04' uses: lukka/run-cmake@v3.4 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced @@ -336,6 +337,7 @@ jobs: ctest --output-on-failure ${{ env.CTEST_EXPECTED_FAILURES }} - name: install + if: matrix.os != 'ubuntu-14.04' uses: lukka/run-cmake@v3.4 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced @@ -350,7 +352,7 @@ jobs: echo "CMAKE_WORKSPACE=${RUNNER_WORKSPACE//\\/\/}" >> $GITHUB_ENV - name: install test - if: runner.os != 'macOS' + if: runner.os != 'macOS' && matrix.os != 'ubuntu-14.04' uses: lukka/run-cmake@v3.4 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced @@ -881,6 +883,7 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 - name: build + if: matrix.os != 'ubuntu-14.04' uses: lukka/run-cmake@v3.4 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced @@ -906,6 +909,7 @@ jobs: ctest --output-on-failure ${{ env.CTEST_EXPECTED_FAILURES }} - name: install + if: matrix.os != 'ubuntu-14.04' uses: lukka/run-cmake@v3.4 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced @@ -920,7 +924,7 @@ jobs: echo "CMAKE_WORKSPACE=${RUNNER_WORKSPACE//\\/\/}" >> $GITHUB_ENV - name: install test - if: runner.os != 'macOS' + if: runner.os != 'macOS' && matrix.os != 'ubuntu-14.04' uses: lukka/run-cmake@v3.4 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced diff --git a/.github/workflows/src/build.yml b/.github/workflows/src/build.yml index 80b669d62..8b9f90cad 100644 --- a/.github/workflows/src/build.yml +++ b/.github/workflows/src/build.yml @@ -3,6 +3,7 @@ uses: ilammy/msvc-dev-cmd@v1 - name: build + if: matrix.os != 'ubuntu-14.04' uses: lukka/run-cmake@v3.4 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced diff --git a/.github/workflows/src/install-test.yml b/.github/workflows/src/install-test.yml index 95926816b..174c484d6 100644 --- a/.github/workflows/src/install-test.yml +++ b/.github/workflows/src/install-test.yml @@ -5,7 +5,7 @@ echo "CMAKE_WORKSPACE=${RUNNER_WORKSPACE//\\/\/}" >> $GITHUB_ENV - name: install test - if: runner.os != 'macOS' + if: runner.os != 'macOS' && matrix.os != 'ubuntu-14.04' uses: lukka/run-cmake@v3.4 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced diff --git a/.github/workflows/src/install.yml b/.github/workflows/src/install.yml index 35cda17b4..22a4e1092 100644 --- a/.github/workflows/src/install.yml +++ b/.github/workflows/src/install.yml @@ -1,4 +1,5 @@ - name: install + if: matrix.os != 'ubuntu-14.04' uses: lukka/run-cmake@v3.4 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced