Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make Compiler CI tests pass on ubuntu 24.04 runner #77

Merged
merged 1 commit into from
Sep 9, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/test_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-22.04, ubuntu-24.04, macos-latest]
os: [ubuntu-22.04, macos-latest]
uses: nlsandler/nqcc2/.github/workflows/build.yaml@main
with:
chapter: 20
Expand All @@ -26,7 +26,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-22.04, ubuntu-24.04, macos-latest]
os: [ubuntu-22.04, macos-latest]
uses: nlsandler/nqcc2/.github/workflows/build.yaml@main
with:
chapter: 19
Expand All @@ -41,6 +41,10 @@ jobs:
os: [ubuntu-22.04, ubuntu-24.04, macos-latest]
runs-on: ${{ matrix.os }}
needs: [build-final-nqcc, build-partial-nqcc]
env:
# workaround for the fact that we can't build NQCC on Ubuntu 24.04 (https://github.com/actions/runner-images/issues/10476)
# use NQCC build in ubuntu-22.04 runner when running tests in Ubuntu 24.04
NQCC_OS: ${{ matrix.os == 'ubuntu-24.04' && 'ubuntu-22.04' || matrix.os }}
steps:

# now checkout test suite
Expand All @@ -58,13 +62,13 @@ jobs:
- name: Get final NQCC
uses: actions/download-artifact@v4
with:
name: nqcc-${{ matrix.os }}-20
name: nqcc-${{ env.NQCC_OS }}-20
path: nqcc

- name: Get partial NQCC
uses: actions/download-artifact@v4
with:
name: nqcc-${{ matrix.os }}-19
name: nqcc-${{ env.NQCC_OS }}-19
path: nqcc-partial

- name: Make NQCC executable
Expand Down
Loading