Skip to content

Commit 53acf85

Browse files
authored
fix: switch to astral cargo-dist (#2687)
1 parent 09fc76e commit 53acf85

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Diff for: .github/workflows/release.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# This file was autogenerated by dist: https://opensource.axo.dev/cargo-dist/
1+
# This file was autogenerated by dist: https://github.com/astral-sh/cargo-dist
22
#
3-
# Copyright 2022-2024, axodotdev
3+
# Copyright 2025 Astral Software Inc.
44
# SPDX-License-Identifier: MIT or Apache-2.0
55
#
66
# CI that:
@@ -49,7 +49,7 @@ on:
4949
jobs:
5050
# Run 'dist plan' (or host) to determine what tasks we need to do
5151
plan:
52-
runs-on: "ubuntu-20.04"
52+
runs-on: "ubuntu-22.04"
5353
outputs:
5454
val: ${{ steps.plan.outputs.manifest }}
5555
tag: ${{ !github.event.pull_request && github.ref_name || '' }}
@@ -65,7 +65,7 @@ jobs:
6565
# we specify bash to get pipefail; it guards against the `curl` command
6666
# failing. otherwise `sh` won't catch that `curl` returned non-0
6767
shell: bash
68-
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.28.0/cargo-dist-installer.sh | sh"
68+
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/cargo-dist/releases/download/v0.28.3/cargo-dist-installer.sh | sh"
6969
- name: Cache dist
7070
uses: actions/upload-artifact@v4
7171
with:
@@ -145,7 +145,7 @@ jobs:
145145
dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
146146
echo "dist ran successfully"
147147
- name: Attest
148-
uses: actions/attest-build-provenance@v1
148+
uses: actions/attest-build-provenance@v2
149149
with:
150150
subject-path: "target/distrib/*${{ join(matrix.targets, ', ') }}*"
151151
- id: cargo-dist
@@ -174,7 +174,7 @@ jobs:
174174
needs:
175175
- plan
176176
- build-local-artifacts
177-
runs-on: "ubuntu-20.04"
177+
runs-on: "ubuntu-22.04"
178178
env:
179179
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
180180
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
@@ -224,7 +224,7 @@ jobs:
224224
if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
225225
env:
226226
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
227-
runs-on: "ubuntu-20.04"
227+
runs-on: "ubuntu-22.04"
228228
outputs:
229229
val: ${{ steps.host.outputs.manifest }}
230230
steps:
@@ -288,7 +288,7 @@ jobs:
288288
# still allowing individual publish jobs to skip themselves (for prereleases).
289289
# "host" however must run to completion, no skipping allowed!
290290
if: ${{ always() && needs.host.result == 'success' }}
291-
runs-on: "ubuntu-20.04"
291+
runs-on: "ubuntu-22.04"
292292
env:
293293
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
294294
steps:

Diff for: dist-workspace.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ members = ["cargo:."]
66
# Path that installers should place binaries in
77
install-path = "~/.atuin/bin"
88
# The preferred dist version to use in CI (Cargo.toml SemVer syntax)
9-
cargo-dist-version = "0.28.0"
9+
cargo-dist-version = "0.28.3"
1010
# CI backends to support
1111
ci = "github"
1212
# The installers to generate for each app

0 commit comments

Comments
 (0)