Skip to content

Commit 9406a34

Browse files
committed
Fix CI workflow syntax for MSRV toolchain and SDL step condition.
1 parent 7445300 commit 9406a34

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

.github/embedded-ci.template.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ jobs:
7575
runs-on: ubuntu-latest
7676
steps:
7777
- uses: actions/checkout@v4
78-
- uses: dtolnay/rust-toolchain@${{ env.MSRV }}
78+
- uses: dtolnay/rust-toolchain@master
79+
with:
80+
toolchain: ${{ env.MSRV }}
7981
- uses: Swatinem/rust-cache@v2
8082
- run: cargo check ${{ env.CHECK_ARGS }}
8183

@@ -98,7 +100,7 @@ jobs:
98100
- uses: actions/checkout@v4
99101
- uses: dtolnay/rust-toolchain@stable
100102
- uses: Swatinem/rust-cache@v2
101-
- if: env.NEEDS_SDL == 'true'
103+
- if: ${{ env.NEEDS_SDL == 'true' }}
102104
run: sudo apt-get update && sudo apt-get install -y libsdl2-dev
103105
- run: cargo test ${{ env.TEST_ARGS }}
104106

@@ -121,7 +123,7 @@ jobs:
121123
- uses: actions/checkout@v4
122124
- uses: dtolnay/rust-toolchain@stable
123125
- uses: Swatinem/rust-cache@v2
124-
- if: env.NEEDS_SDL == 'true'
126+
- if: ${{ env.NEEDS_SDL == 'true' }}
125127
run: sudo apt-get update && sudo apt-get install -y libsdl2-dev
126128
- run: cargo build --examples --all-features
127129

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ jobs:
6464
runs-on: ubuntu-latest
6565
steps:
6666
- uses: actions/checkout@v4
67-
- uses: dtolnay/rust-toolchain@${{ env.MSRV }}
67+
- uses: dtolnay/rust-toolchain@master
68+
with:
69+
toolchain: ${{ env.MSRV }}
6870
- uses: Swatinem/rust-cache@v2
6971
- run: cargo check ${{ env.CHECK_ARGS }}
7072

@@ -88,7 +90,7 @@ jobs:
8890
- uses: dtolnay/rust-toolchain@stable
8991
- uses: Swatinem/rust-cache@v2
9092
- name: Install SDL2
91-
if: env.NEEDS_SDL == 'true'
93+
if: ${{ env.NEEDS_SDL == 'true' }}
9294
run: sudo apt-get update && sudo apt-get install -y libsdl2-dev
9395
- run: bash .github/scripts/ci_test.sh
9496

0 commit comments

Comments
 (0)