Skip to content

Commit de88135

Browse files
committed
ci: rust-cache after toolchain install
1 parent 46bbc1c commit de88135

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ jobs:
3838
- if: ${{ runner.os == 'Linux' }}
3939
name: Linux - Install native dependencies
4040
run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
41+
# just need a random command that forces the installation of rust-toolchain
42+
# figure out native target triple while we're at it
43+
- name: install rust-toolchain
44+
run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
4145
- uses: Swatinem/rust-cache@v2
4246
with:
4347
workspaces: |
4448
.
4549
tests/difftests/tests
46-
# just need a random command that forces the installation of rust-toolchain
47-
# figure out native target triple while we're at it
48-
- name: install rust-toolchain
49-
run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
5050
# Fetch dependencies in a separate step to clearly show how long each part
5151
# of the testing takes
5252
- name: cargo fetch --locked
@@ -101,13 +101,13 @@ jobs:
101101
install_runtime: true
102102
cache: true
103103
stripdown: true
104+
- name: install rust-toolchain
105+
run: cargo version
104106
- uses: Swatinem/rust-cache@v2
105107
with:
106108
workspaces: |
107109
.
108110
tests/difftests/tests
109-
- name: install rust-toolchain
110-
run: cargo version
111111
- name: cargo fetch --locked
112112
run: cargo fetch --locked --target ${{ matrix.target }}
113113

@@ -150,13 +150,13 @@ jobs:
150150
install_runtime: true
151151
cache: true
152152
stripdown: true
153+
- name: install rust-toolchain
154+
run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
153155
- uses: Swatinem/rust-cache@v2
154156
with:
155157
workspaces: |
156158
.
157159
tests/difftests/tests
158-
- name: install rust-toolchain
159-
run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
160160
- name: cargo fetch --locked
161161
run: cargo fetch --locked --target $TARGET
162162
- name: compiletest
@@ -190,13 +190,13 @@ jobs:
190190
sudo add-apt-repository ppa:kisak/turtle -y
191191
sudo apt-get update
192192
sudo apt install -y xvfb libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
193+
- name: install rust-toolchain
194+
run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
193195
- uses: Swatinem/rust-cache@v2
194196
with:
195197
workspaces: |
196198
.
197199
tests/difftests/tests
198-
- name: install rust-toolchain
199-
run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
200200
- name: cargo fetch --locked
201201
run: cargo fetch --locked --target $TARGET
202202
- name: cargo fetch --locked difftests
@@ -243,14 +243,14 @@ jobs:
243243
install_runtime: true
244244
cache: true
245245
stripdown: true
246+
# cargo version is a random command that forces the installation of rust-toolchain
247+
- name: install rust-toolchain
248+
run: cargo version
246249
- uses: Swatinem/rust-cache@v2
247250
with:
248251
workspaces: |
249252
.
250253
tests/difftests/tests
251-
# cargo version is a random command that forces the installation of rust-toolchain
252-
- name: install rust-toolchain
253-
run: cargo version
254254
- name: Install rustup components
255255
run: rustup component add rustfmt clippy
256256
- name: cargo fetch --locked

0 commit comments

Comments
 (0)