Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: Swatinem/rust-cache@v2
with:
{ toolchain: nightly, components: "rustfmt, clippy", rustflags: "" }
shared-key: test-ubuntu-latest
save-if: false
- run: |
cargo build --all-features
echo "$PWD/target/debug" >> "$GITHUB_PATH"
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release-fig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ jobs:
with:
fetch-depth: 0
token: ${{ secrets.MY_RELEASE_PLEASE_TOKEN }}
- uses: actions-rust-lang/setup-rust-toolchain@v1
with: { toolchain: nightly, components: rustfmt }
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: Swatinem/rust-cache@v2
with:
shared-key: test-ubuntu-latest
save-if: false
- run: mkdir -p "$HOME/bin" && echo "$HOME/bin" >> "$GITHUB_PATH"
- run: npm i
- run: cargo build --all-features && cp target/debug/mise "$HOME"/bin
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release-plz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ jobs:
git_user_signingkey: true
git_commit_gpgsign: true
git_tag_gpgsign: true
- uses: actions-rust-lang/setup-rust-toolchain@v1
with: { toolchain: nightly, components: rustfmt }
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: Swatinem/rust-cache@v2
with:
shared-key: test-ubuntu-latest
save-if: false
- run: mkdir -p "$HOME/bin" && echo "$HOME/bin" >> "$GITHUB_PATH"
- run: npm i
- run: cargo build --all-features && cp target/debug/mise "$HOME"/bin
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ jobs:
container: ghcr.io/jdx/mise:alpine
timeout-minutes: 30
needs: [release]
if: startsWith(github.event.ref, 'refs/tags/v') && endsWith(github.event.ref, '.0')
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ jobs:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.head_ref }}
token: ${{ secrets.RTX_GITHUB_BOT_TOKEN || github.token }}
- uses: actions-rust-lang/setup-rust-toolchain@v1
with: { toolchain: stable, components: rustfmt }
- uses: Swatinem/rust-cache@v2
with:
shared-key: test-${{ matrix.os }}
save-if: ${{ github.ref_name == 'main' }}
- uses: taiki-e/install-action@v2
with:
tool: nextest,cargo-deny,cargo-msrv,cargo-machete,usage-cli
Expand Down Expand Up @@ -91,7 +93,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
shared-key: coverage
save-if: ${{ github.ref_name == 'main' && matrix.tranche == 0 }}
save-if: ${{ github.ref_name == 'main' && matrix.tranche == 3 }}
- name: Install build and test dependencies
run: |
sudo apt-get update && sudo apt-get install \
Expand Down Expand Up @@ -157,6 +159,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
with:
shared-key: test-windows-latest
save-if: ${{ github.ref_name == 'main' }}
# TODO: enable when we can remove continue-on-error:
# - name: cargo test
# uses: nick-fields/retry@v3
Expand All @@ -173,6 +178,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
with:
shared-key: test-windows-latest
save-if: false
- run: cargo build
- run: Add-Content $env:GITHUB_PATH "$PWD\target\debug"
- name: e2e
Expand Down
3 changes: 2 additions & 1 deletion src/config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,8 @@ impl Config {
fn load_task_file(&self, path: &Path) -> Result<Vec<Task>> {
let raw = file::read_to_string(path)?;
let mut tasks = toml::from_str::<Tasks>(&raw)
.wrap_err_with(|| format!("Error parsing task file: {}", display_path(path)))?.0;
.wrap_err_with(|| format!("Error parsing task file: {}", display_path(path)))?
.0;
for (name, task) in &mut tasks {
task.name = name.clone();
task.config_source = path.to_path_buf();
Expand Down