Skip to content

Commit 04e7bfb

Browse files
willcl-arkm3dwards
andcommitted
ci: update windows-cross job
Co-authored-by: Max Edwards <[email protected]>
1 parent cc1735d commit 04e7bfb

File tree

1 file changed

+12
-24
lines changed

1 file changed

+12
-24
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,8 @@ jobs:
302302
303303
windows-cross:
304304
name: 'Linux->Windows cross, no tests'
305-
runs-on: ubuntu-latest
305+
needs: runners
306+
runs-on: ${{ needs.runners.outputs.use-cirrus-runners == 'true' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md' || 'ubuntu-24.04' }}
306307
if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
307308

308309
env:
@@ -313,36 +314,23 @@ jobs:
313314
- name: Checkout
314315
uses: actions/checkout@v5
315316

316-
- name: Set CI directories
317-
run: |
318-
echo "CCACHE_DIR=${{ runner.temp }}/ccache_dir" >> "$GITHUB_ENV"
319-
echo "BASE_ROOT_DIR=${{ runner.temp }}" >> "$GITHUB_ENV"
320-
echo "DEPENDS_DIR=${{ runner.temp }}/depends" >> "$GITHUB_ENV"
321-
echo "BASE_BUILD_DIR=${{ runner.temp }}/build" >> "$GITHUB_ENV"
317+
- name: Configure environment
318+
uses: ./.github/actions/configure-environment
322319

323-
- name: Depends cache
324-
uses: actions/cache@v4
325-
with:
326-
path: ${{ env.DEPENDS_DIR }}/built
327-
key: ${{ github.job }}-depends-${{ hashFiles('depends/**', 'ci/test/00_setup_env_win64.sh') }}
320+
- name: Restore caches
321+
id: restore-cache
322+
uses: ./.github/actions/restore-caches
328323

329-
- name: Restore Ccache cache
330-
id: ccache-cache
331-
uses: actions/cache/restore@v4
324+
- name: Configure Docker
325+
uses: ./.github/actions/configure-docker
332326
with:
333-
path: ${{ env.CCACHE_DIR }}
334-
key: ${{ github.job }}-ccache-${{ github.run_id }}
335-
restore-keys: ${{ github.job }}-ccache-
327+
use-cirrus: ${{ needs.runners.outputs.use-cirrus-runners }}
336328

337329
- name: CI script
338330
run: ./ci/test_run_all.sh
339331

340-
- name: Save Ccache cache
341-
uses: actions/cache/save@v4
342-
if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true'
343-
with:
344-
path: ${{ env.CCACHE_DIR }}
345-
key: ${{ github.job }}-ccache-${{ github.run_id }}
332+
- name: Save caches
333+
uses: ./.github/actions/save-caches
346334

347335
- name: Upload built executables
348336
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)