Skip to content

Commit ee3dc49

Browse files
committed
update cargo-dist version
1 parent 98a11a6 commit ee3dc49

File tree

6 files changed

+11
-36
lines changed

6 files changed

+11
-36
lines changed

.github/workflows/nix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Check flake
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212
- uses: cachix/install-nix-action@v31
1313
with:
1414
github_access_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# This file was autogenerated by dist: https://github.com/astral-sh/cargo-dist
1+
# This file was autogenerated by dist: https://axodotdev.github.io/cargo-dist
22
#
33
# Copyright 2022-2024, axodotdev
4-
# Copyright 2025 Astral Software Inc.
54
# SPDX-License-Identifier: MIT or Apache-2.0
65
#
76
# CI that:
@@ -65,7 +64,7 @@ jobs:
6564
# we specify bash to get pipefail; it guards against the `curl` command
6665
# failing. otherwise `sh` won't catch that `curl` returned non-0
6766
shell: bash
68-
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/cargo-dist/releases/download/v0.28.5/cargo-dist-installer.sh | sh"
67+
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.3/cargo-dist-installer.sh | sh"
6968
- name: Cache dist
7069
uses: actions/upload-artifact@v4
7170
with:
@@ -218,8 +217,8 @@ jobs:
218217
- plan
219218
- build-local-artifacts
220219
- build-global-artifacts
221-
# Only run if we're "publishing", and only if local and global didn't fail (skipped is fine)
222-
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') }}
220+
# Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine)
221+
if: ${{ always() && needs.plan.result == 'success' && 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') }}
223222
env:
224223
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
225224
runs-on: "ubuntu-22.04"

.github/workflows/rust.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
name: Rust
2-
on: [push, pull_request]
2+
on:
3+
- push
4+
- pull_request
35

46
jobs:
57
check:
68
name: Check and test Rust code
79
runs-on: ubuntu-latest
810
steps:
9-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1012
- uses: dtolnay/rust-toolchain@stable
1113
with:
1214
components: rustfmt, clippy

dist-workspace.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ members = ["cargo:."]
44
# Config for 'dist'
55
[dist]
66
# The preferred dist version to use in CI (Cargo.toml SemVer syntax)
7-
cargo-dist-version = "0.28.5"
7+
cargo-dist-version = "0.30.3"
88
# CI backends to support
99
ci = "github"
1010
# The installers to generate for each app
1111
installers = []
1212
# Target platforms to build apps for (Rust target-triple syntax)
1313
targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-unknown-linux-gnu"]
14-
# The archive format to use for non-windows builds (defaults .tar.xz)
15-
unix-archive = ".tar.gz"
16-
# Which actions to run on pull requests
17-
pr-run-mode = "plan"

flake.nix

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,28 +57,8 @@
5757
devShells = forAllPkgs (
5858
pkgs:
5959
let
60-
inherit (pkgs) fetchFromGitHub;
61-
6260
file-rust-toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
6361
rust-toolchain = file-rust-toolchain.override { extensions = [ "rust-analyzer" ]; };
64-
65-
cargo-dist = pkgs.cargo-dist.overrideAttrs (
66-
final-attrs: old-attrs: {
67-
version = "0.28.5";
68-
src = fetchFromGitHub {
69-
owner = "astral-sh";
70-
repo = "cargo-dist";
71-
rev = "v${final-attrs.version}";
72-
hash = "sha256-SUMonuiX1xh1Fz77hf+v1I9nDIl9Am5B7Upv2zPcVJg=";
73-
};
74-
75-
cargoHash = "sha256-cc/gCm9f86byXGVztMIbwoP2a8bmXk1r7ODhWFGa6IE=";
76-
cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
77-
inherit (final-attrs) pname src version;
78-
hash = final-attrs.cargoHash;
79-
};
80-
}
81-
);
8262
in
8363
{
8464
default = pkgs.mkShell {

package.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
wakatime-cli,
88
}:
99

10-
with lib;
11-
1210
let
13-
inherit (gitignore.lib) gitignoreSource;
11+
inherit (gitignore.lib) gitignoreSource makeBinPath;
1412

1513
src = gitignoreSource ./.;
1614
cargoTOML = lib.importTOML "${src}/Cargo.toml";

0 commit comments

Comments
 (0)