Skip to content

Commit

Permalink
Don't use get-cmake for Ubuntu 14.04
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathan-r-thorpe committed Dec 4, 2024
1 parent 3293b67 commit 6ec0807
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ jobs:
uses: ilammy/msvc-dev-cmd@v1

- name: build
if: matrix.os != 'ubuntu-14.04'
uses: lukka/[email protected]
with:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
Expand All @@ -336,6 +337,7 @@ jobs:
ctest --output-on-failure ${{ env.CTEST_EXPECTED_FAILURES }}
- name: install
if: matrix.os != 'ubuntu-14.04'
uses: lukka/[email protected]
with:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
Expand All @@ -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/[email protected]
with:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
Expand Down Expand Up @@ -881,6 +883,7 @@ jobs:
uses: ilammy/msvc-dev-cmd@v1

- name: build
if: matrix.os != 'ubuntu-14.04'
uses: lukka/[email protected]
with:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
Expand All @@ -906,6 +909,7 @@ jobs:
ctest --output-on-failure ${{ env.CTEST_EXPECTED_FAILURES }}
- name: install
if: matrix.os != 'ubuntu-14.04'
uses: lukka/[email protected]
with:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
Expand All @@ -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/[email protected]
with:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/src/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
uses: ilammy/msvc-dev-cmd@v1

- name: build
if: matrix.os != 'ubuntu-14.04'
uses: lukka/[email protected]
with:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/src/install-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/src/install.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- name: install
if: matrix.os != 'ubuntu-14.04'
uses: lukka/[email protected]
with:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
Expand Down

0 comments on commit 6ec0807

Please sign in to comment.