chore: small cleanups

Author: dustinblackman

.cargo/config.toml

@@ -1,6 +1,6 @@
 [alias]
 bin = ["run", "--package", "cargo-bin", "--"]
-cmd = ["bin", "cargo-cmd"]
+cmd = ["run", "--package", "cargo-cmd", "--"]
 deny = ["bin", "cargo-deny"]
 gha = ["bin", "cargo-gha"]
 insta = ["bin", "cargo-insta"]

.github/workflows/test.yml

@@ -7,46 +7,33 @@ jobs:
     name: cargo-run-bin
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-directories: ".bin"
-
+      - uses: actions/checkout@v6
       - name: Install deps
         run: |
-          cargo bin --build
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
           cargo cmd setup-nightly
+          cargo deny --help > /dev/null 2>&1
+          cargo llvm-cov --help > /dev/null 2>&1
+          cargo nextest --help > /dev/null 2>&1
       - name: Lint
         run: cargo cmd lint
       - name: Test
         run: cargo cmd test-coverage-lcov
-
       - name: Coveralls
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: ./lcov.info
 
-  test:
+  test-macos:
     name: cargo-run-bin
-    strategy:
-      matrix:
-        os: [macos-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-directories: ".bin"
+      - uses: actions/checkout@v6
       - name: Install deps
         run: |
-          cargo nextest --help
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+          cargo nextest --help > /dev/null 2>&1
       - name: Test
         run: |
           cargo build

Cargo.lock

@@ -19,6 +19,9 @@ exclude = [
     "rust-toolchain.toml"
 ]
 
+[workspace]
+members = ["tools/cargo-bin", "tools/cargo-cmd"]
+
 [[bin]]
 name = "cargo-bin"
 path = "src/main.rs"
@@ -34,7 +37,7 @@ cfg-if = "1.0.0"
 clap = { version = "4.3.19", optional = true }
 rustversion = "1.0.14"
 serde = { version = "1.0.149", features = ["derive"] }
-toml = "0.5.9"
+toml = "0.8.23"
 toml_edit = "0.19.14"
 version_check = "0.9.3"
 which = "4.4.0"
@@ -45,9 +48,7 @@ cargo-husky = { version = "1.5.0", default-features = false, features = ["user-h
 insta = { version = "1.31.0", features = ["yaml"] }
 
 [package.metadata.bin]
-cargo-cmd = { version = "0.3.1", locked = true }
 cargo-deny = { version = "0.13.5", locked = true }
-cargo-gha = { version = "1.0.2", locked = true }
 cargo-insta = { version = "1.31.0", locked = true }
 cargo-llvm-cov = { version = "0.5.25", locked = true }
 cargo-nextest = { version = "0.9.57", locked = true }
@@ -61,15 +62,6 @@ dustinblackman-hello-world = { version = "0.2.1", git = "https://github.com/dust
 all-features = false
 features = []
 
-[package.metadata.gha]
-targets = ["aarch64-apple-darwin"]
-
-[[package.metadata.gha.assets]]
-owner_repo = "cli/cli"
-tag = "v2.40.1"
-binaries = ["gh"]
-target_archives = { aarch64-apple-darwin = "gh_{NOVTAG}_macOS_arm64.zip" }
-
 [profile.dev.package.insta]
 opt-level = 3
 
@@ -98,11 +90,14 @@ cargo fix --allow-dirty
 cargo +runbin-nightly fmt
 '''
 
-get-nightly-name = 'echo runbin-nightly'
 setup-nightly = '''
-  export NIGHTLY=nightly-2023-06-16
-  rustup toolchain list -v | grep -q "$NIGHTLY" || rustup toolchain install "$NIGHTLY" --force --component llvm-tools-preview rustfmt
-  rustup toolchain link runbin-nightly "$(rustup toolchain list -v | grep $NIGHTLY | grep '^nightly-' | awk '{print $2}')"
+  export RIPTIDE_NIGHTLY_VERSION=nightly-2025-12-05
+  export RIPTIDE_NIGHTLY_NAME=runbin-nightly
+
+  if !(rustup toolchain list -v | grep "$RIPTIDE_NIGHTLY_NAME" | grep -q "$RIPTIDE_NIGHTLY_VERSION"); then
+    rustup toolchain install "$RIPTIDE_NIGHTLY_VERSION" --component llvm-tools-preview rustfmt --force
+    rustup toolchain link "$RIPTIDE_NIGHTLY_NAME" "$(rustup toolchain list -v | grep $RIPTIDE_NIGHTLY_VERSION | grep '^nightly-' | awk '{print $NF}')"
+  fi
 '''
 
 release = '''set -e
@@ -119,8 +114,8 @@ release = '''set -e
   git push --tags
 
   cargo publish
-  cargo gha gh release create "v$RB_VERSION" --generate-notes
-  cargo bin git-cliff --latest --strip header | cargo gha gh release edit "v$RB_VERSION" --notes-file -
+  gh release create "v$RB_VERSION" --generate-notes
+  cargo bin git-cliff --latest --strip header | gh release edit "v$RB_VERSION" --notes-file -
 '''
 
 test-coverage = '''set -e
@@ -146,7 +141,4 @@ test = '''set -e
 '''
 test-watch = '''set -e
   cargo watch -i .cargo -x 'cmd test'
-'''
-
-[workspace]
-members = ["tools/cargo-bin"]
+'''

Cargo.toml

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Dustin Blackman
+Copyright (c) 2021-2025 Dustin Blackman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.75.0"
-components = ["rustfmt", "clippy", "llvm-tools-preview"]
+channel = "1.91.1"
+components = ["rustfmt", "clippy", "llvm-tools-preview"]

rust-toolchain.toml

@@ -0,0 +1,7 @@
+[package]
+name = "cargo-cmd"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+toml = "=0.8.23"