From 5654060dc83d26886c21501975fe75030a1993ac Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sat, 30 Aug 2025 14:31:14 -0600 Subject: [PATCH] ci: Use uv tool instead of venv --- .github/workflows/build.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 072b2f7..71558fe 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -146,13 +146,14 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Install uv + if: matrix.build == 'zigbuild' + uses: astral-sh/setup-uv@v6 - name: Install cargo-zigbuild if: matrix.build == 'zigbuild' run: | - python3 -m venv .venv - . .venv/bin/activate - echo PATH=$PATH >> $GITHUB_ENV - pip install ziglang==0.13.0.post1 cargo-zigbuild==0.19.8 + uv tool install cargo-zigbuild==0.20.1 --with-executables-from ziglang==0.15.1 + echo "CARGO_ZIGBUILD_ZIG_PATH=\"$(uv tool dir)/cargo-zigbuild/bin/python-zig\"" >> $GITHUB_ENV - name: Setup Rust toolchain uses: dtolnay/rust-toolchain@stable with: @@ -213,13 +214,14 @@ jobs: sudo apt-get -y install ${{ matrix.packages }} - name: Checkout uses: actions/checkout@v4 + - name: Install uv + if: matrix.build == 'zigbuild' + uses: astral-sh/setup-uv@v6 - name: Install cargo-zigbuild if: matrix.build == 'zigbuild' run: | - python3 -m venv .venv - . .venv/bin/activate - echo PATH=$PATH >> $GITHUB_ENV - pip install ziglang==0.13.0.post1 cargo-zigbuild==0.19.8 + uv tool install cargo-zigbuild==0.20.1 --with-executables-from ziglang==0.15.1 + echo "CARGO_ZIGBUILD_ZIG_PATH=\"$(uv tool dir)/cargo-zigbuild/bin/python-zig\"" >> $GITHUB_ENV - name: Setup Rust toolchain uses: dtolnay/rust-toolchain@stable with: