Skip to content

Commit 896a430

Browse files
committed
Fix ci failures.
1 parent d7f02d2 commit 896a430

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

.github/actions/setup-anki/action.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,29 @@ runs:
4949
- name: Install rsync (Windows)
5050
if: runner.os == 'Windows'
5151
shell: bash
52-
run: choco install rsync -y
52+
run: |
53+
/c/msys64/usr/bin/pacman.exe -Sy --noconfirm rsync
54+
echo "C:\msys64\usr\bin" >> "$GITHUB_PATH"
5355
56+
# Reads toolchain version from rust-toolchain.toml automatically.
5457
- name: Install Rust toolchain
55-
uses: dtolnay/rust-toolchain@stable
58+
uses: actions-rust-lang/setup-rust-toolchain@v1
5659
with:
57-
toolchain: "1.92.0"
5860
components: clippy
61+
cache: false # ci.yml manages its own cargo cache
5962

60-
# Install uv via setup-uv and point the build system at it via UV_BINARY so it skips downloading its own copy.
61-
- name: Install uv (Linux)
62-
if: runner.os == 'Linux'
63+
# Install uv via setup-uv and point the build system at it via UV_BINARY
64+
# so it skips downloading its own copy (see build/ninja_gen/src/python.rs).
65+
- name: Install uv
66+
id: setup-uv
6367
uses: astral-sh/setup-uv@v7
6468
with:
6569
enable-cache: true
70+
prune-cache: ${{ runner.os != 'Windows' }} # Windows file-locking breaks cache pruning
6671

6772
- name: Set UV_BINARY
68-
if: runner.os == 'Linux'
6973
shell: bash
70-
run: echo "UV_BINARY=$(which uv)" >> "$GITHUB_ENV"
74+
run: echo "UV_BINARY=${{ steps.setup-uv.outputs.uv-path }}" >> "$GITHUB_ENV"
7175

7276
- name: Install n2
7377
shell: bash

0 commit comments

Comments
 (0)