Skip to content

Commit

Permalink
feat: use aqua for cargo-binstall (#3182)
Browse files Browse the repository at this point in the history
* feat: use aqua for cargo-binstall

* chore: use expr for semver()
  • Loading branch information
jdx authored Nov 25, 2024
1 parent 0df8bf7 commit 4d50133
Show file tree
Hide file tree
Showing 11 changed files with 288 additions and 69 deletions.
50 changes: 25 additions & 25 deletions .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS: -C link-arg=-fuse-ld=mold

jobs:
ubuntu:
autofix:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
Expand All @@ -48,27 +48,27 @@ jobs:
- run: mise run render
- run: mise run lint-fix
- uses: autofix-ci/[email protected]
windows:
runs-on: windows-latest
timeout-minutes: 30
steps:
- run: git config --global core.autocrlf false
- uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
with:
shared-key: autofix
- run: |
cargo build
Add-Content $env:GITHUB_PATH "$env:GITHUB_WORKSPACE\target\debug"
shell: pwsh
- uses: actions/cache@v4
with:
key: ${{ runner.os }}-mise-tools-${{ hashFiles('mise.lock') }}
path: |
~/.local/share/mise
~/.cache/mise
- run: mise install
- run: mise x -- npm i
#- run: mise run render
- run: mise run lint-fix
- uses: autofix-ci/[email protected]
# windows:
# runs-on: windows-latest
# timeout-minutes: 30
# steps:
# - run: git config --global core.autocrlf false
# - uses: actions/checkout@v4
# - uses: Swatinem/rust-cache@v2
# with:
# shared-key: autofix
# - run: |
# cargo build
# Add-Content $env:GITHUB_PATH "$env:GITHUB_WORKSPACE\target\debug"
# shell: pwsh
# - uses: actions/cache@v4
# with:
# key: ${{ runner.os }}-mise-tools-${{ hashFiles('mise.lock') }}
# path: |
# ~/.local/share/mise
# ~/.cache/mise
# - run: mise install
# - run: mise x -- npm i
# #- run: mise run render
# - run: mise run lint-fix
# - uses: autofix-ci/[email protected]
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ jobs:
TEST_ALL: ${{github.ref_name == 'release' && '1' || '0'}}
MISE_DATA_DIR: ~/.local/share/mise
MISE_CACHE_DIR: ~/.cache/mise
MISE_USE_VERSIONS_HOST: 1
MISE_DISABLE_TOOLS: |
1password-cli,
adr-tools
Expand Down Expand Up @@ -359,3 +358,5 @@ jobs:
retry_wait_seconds: 30
max_attempts: 2
command: mise test-tool --all
env:
MISE_USE_VERSIONS_HOST: 0
164 changes: 159 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ digest = "0.10.7"
dotenvy = "0.15"
duct = "0.13"
either = { version = "1", features = ["serde"] }
# expr-lang = { path = "../expr-lang" }
expr-lang = "0.1"
eyre = "0.6"
filetime = "0.2"
flate2 = "1"
Expand Down
2 changes: 1 addition & 1 deletion docs/registry.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ editLink: false
| calendarsync | [asdf:FeryET/asdf-calendarsync](https://github.com/FeryET/asdf-calendarsync) |
| calicoctl | [aqua:projectcalico/calico/calicoctl](https://github.com/projectcalico/calico/calicoctl) [asdf:TheCubicleJockey/asdf-calicoctl](https://github.com/TheCubicleJockey/asdf-calicoctl) |
| camunda-modeler | [asdf:barmac/asdf-camunda-modeler](https://github.com/barmac/asdf-camunda-modeler) |
| cargo-binstall | [ubi:cargo-bins/cargo-binstall](https://github.com/cargo-bins/cargo-binstall) [cargo:cargo-binstall](https://crates.io/crates/cargo-binstall) |
| cargo-binstall | [aqua:cargo-bins/cargo-binstall](https://github.com/cargo-bins/cargo-binstall) [ubi:cargo-bins/cargo-binstall](https://github.com/cargo-bins/cargo-binstall) [cargo:cargo-binstall](https://crates.io/crates/cargo-binstall) |
| cargo-insta | [ubi:mitsuhiko/insta](https://github.com/mitsuhiko/insta) |
| cargo-make | [asdf:mise-plugins/asdf-cargo-make](https://github.com/mise-plugins/asdf-cargo-make) |
| carp | [asdf:susurri/asdf-carp](https://github.com/susurri/asdf-carp) |
Expand Down
2 changes: 2 additions & 0 deletions mise.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ version = "1.1.36"
version = "1.10.13"

[tools.cargo-binstall.checksums]
"cargo-binstall-aarch64-apple-darwin.zip" = "sha256:b3057055d33e443e6e07b23fea851a420dcb8c29338d1cb1e14401f91162bfe9"
cargo-binstall-linux-x86_64 = "sha256:53a7157f56e1698d42d3cd50b1d08f02159638e3a73edf362e14215337942e86"
cargo-binstall-macos-aarch64 = "sha256:f67dd4fc8ea01b4c55fe041a0fbd6d81a361947f1dbf2bd226490c641cc167b3"
"cargo-binstall-x86_64-pc-windows-msvc.zip" = "sha256:6c5272909b50bf93758a294c32195e8874494e5fa1ac5c741a103070c8d1d599"
"cargo-binstall.exe-windows-x86_64" = "sha256:32a28a1e98ad23e2c7ac360b815001181d7feffd1283a20c6ef92c3c032d6ba6"

[tools."cargo:cargo-edit"]
Expand Down
Loading

0 comments on commit 4d50133

Please sign in to comment.