diff options
| author | Ellie Huxtable <ellie@atuin.sh> | 2025-03-12 12:58:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-12 12:58:15 +0000 |
| commit | c410ad55f9cbbf84857085e0861f010c3dd5fa3d (patch) | |
| tree | b3bb5238420d75b27708d99b0d74d94d0d8b944a /.github | |
| parent | fix: multiline command does not honour max_preview_height (#2624) (diff) | |
| download | atuin-c410ad55f9cbbf84857085e0861f010c3dd5fa3d.zip | |
chore(deps): update cargo-dist to 0.28 (#2623)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/release.yml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c72faf54..6e99b38c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,7 +65,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.25.1/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.28.0/cargo-dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: @@ -109,6 +109,7 @@ jobs: # - N "local" tasks that build each platform's binaries and platform-specific installers matrix: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix }} runs-on: ${{ matrix.runner }} + container: ${{ matrix.container && matrix.container.image || null }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json @@ -119,8 +120,15 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive + - name: Install Rust non-interactively if not already installed + if: ${{ matrix.container }} + run: | + if ! command -v cargo > /dev/null 2>&1; then + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + echo "$HOME/.cargo/bin" >> $GITHUB_PATH + fi - name: Install dist - run: ${{ matrix.install_dist }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 @@ -149,7 +157,7 @@ jobs: run: | # Parse out what we just built and upload it to scratch storage echo "paths<<EOF" >> "$GITHUB_OUTPUT" - jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT" + dist print-upload-files-from-manifest --manifest dist-manifest.json >> "$GITHUB_OUTPUT" echo "EOF" >> "$GITHUB_OUTPUT" cp dist-manifest.json "$BUILD_MANIFEST_NAME" |