Skip to content

Commit

Permalink
Disconnect the CI OS detection from the OS version. (#776)
Browse files Browse the repository at this point in the history
The current `matrix.os == 'ubuntu-latest'` expression works, but will
fail if we for some reason need to switch to explicitly use e.g.
`ubuntu-24.04`. Doing the same check via `runner.os == 'Linux'`
disconnects the check from the specific OS version.
  • Loading branch information
xStrom authored Dec 8, 2024
1 parent 3d2dd78 commit 9439b55
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
tool: cargo-hack

- name: Install native dependencies
if: matrix.os == 'ubuntu-latest'
if: runner.os == 'Linux'
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev

- name: Restore cache
Expand Down Expand Up @@ -255,12 +255,12 @@ jobs:
toolchain: ${{ env.RUST_STABLE_VER }}

- name: Install native dependencies
if: matrix.os == 'ubuntu-latest'
if: runner.os == 'Linux'
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev

# Adapted from https://github.com/bevyengine/bevy/blob/b446374392adc70aceb92621b080d1a6cf7a7392/.github/workflows/validation-jobs.yml#L74-L79
- name: Install xvfb, llvmpipe and lavapipe
if: matrix.os == 'ubuntu-latest'
if: runner.os == 'Linux'
# https://launchpad.net/~kisak/+archive/ubuntu/turtle
run: |
sudo apt-get update -y -qq
Expand Down Expand Up @@ -366,7 +366,7 @@ jobs:
tool: cargo-hack

- name: Install native dependencies
if: matrix.os == 'ubuntu-latest'
if: runner.os == 'Linux'
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev

- name: Restore cache
Expand Down

0 comments on commit 9439b55

Please sign in to comment.