diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 68eeae6..a30bd11 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,7 +34,7 @@ jobs: fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }} matrix: os: - - ubuntu-latest + - ubuntu-24.04 - macos-13 - windows-latest toolchain: [stable, nightly] diff --git a/dist/index.js b/dist/index.js index 0833494..499d98f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -11815,7 +11815,7 @@ async function dockerBuild(container, maturinRelease, hostHomeMount, args) { 'set -e', 'echo "::group::Install Rust"', `which rustup > /dev/null || curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain ${rustToolchain}`, - 'export PATH="$HOME/.cargo/bin:$PATH"', + 'export PATH="$HOME/.cargo/bin:$HOME/.local/bin:$PATH"', `echo "Install Rust toolchain ${rustToolchain}"`, `rustup override set ${rustToolchain}`, `rustup component add llvm-tools-preview || true`, @@ -11824,12 +11824,12 @@ async function dockerBuild(container, maturinRelease, hostHomeMount, args) { 'echo "::group::Install maturin"', `curl -L ${url} | tar -xz -C /usr/local/bin`, 'maturin --version || true', - 'which patchelf > /dev/null || python3 -m pip install patchelf', - 'python3 -m pip install cffi || true', + 'which patchelf > /dev/null || python3 -m pip install --user patchelf', + 'python3 -m pip install --user cffi || true', 'echo "::endgroup::"' ]; if (args.includes('--zig')) { - commands.push('echo "::group::Install Zig"', 'python3 -m pip install ziglang', 'echo "::endgroup::"'); + commands.push('echo "::group::Install Zig"', 'python3 -m pip install --user ziglang', 'echo "::endgroup::"'); } if (target.length > 0) { commands.push('echo "::group::Install Rust target"', `if [[ ! -d $(rustc --print target-libdir --target ${target}) ]]; then rustup target add ${target}; fi`, 'echo "::endgroup::"'); @@ -11843,7 +11843,7 @@ async function dockerBuild(container, maturinRelease, hostHomeMount, args) { commands.push('echo "::group::Run before script"', ...beforeScript.split('\n'), 'echo "::endgroup::"'); } if (sccache) { - commands.push('echo "::group::Install sccache"', 'python3 -m pip install "sccache>=0.4.0"', 'sccache --version', 'echo "::endgroup::"'); + commands.push('echo "::group::Install sccache"', 'python3 -m pip install --user "sccache>=0.4.0"', 'sccache --version', 'echo "::endgroup::"'); setupSccacheEnv(); } commands.push(`maturin ${args.join(' ')}`); diff --git a/src/index.ts b/src/index.ts index eb69db0..429f002 100644 --- a/src/index.ts +++ b/src/index.ts @@ -554,7 +554,7 @@ async function dockerBuild( // Install Rust 'echo "::group::Install Rust"', `which rustup > /dev/null || curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain ${rustToolchain}`, - 'export PATH="$HOME/.cargo/bin:$PATH"', + 'export PATH="$HOME/.cargo/bin:$HOME/.local/bin:$PATH"', `echo "Install Rust toolchain ${rustToolchain}"`, `rustup override set ${rustToolchain}`, `rustup component add llvm-tools-preview || true`, @@ -565,14 +565,14 @@ async function dockerBuild( 'echo "::group::Install maturin"', `curl -L ${url} | tar -xz -C /usr/local/bin`, 'maturin --version || true', - 'which patchelf > /dev/null || python3 -m pip install patchelf', - 'python3 -m pip install cffi || true', // Allow failure for now + 'which patchelf > /dev/null || python3 -m pip install --user patchelf', + 'python3 -m pip install --user cffi || true', // Allow failure for now 'echo "::endgroup::"' ] if (args.includes('--zig')) { commands.push( 'echo "::group::Install Zig"', - 'python3 -m pip install ziglang', + 'python3 -m pip install --user ziglang', 'echo "::endgroup::"' ) } @@ -604,7 +604,7 @@ async function dockerBuild( if (sccache) { commands.push( 'echo "::group::Install sccache"', - 'python3 -m pip install "sccache>=0.4.0"', + 'python3 -m pip install --user "sccache>=0.4.0"', 'sccache --version', 'echo "::endgroup::"' )