Skip to content

Commit

Permalink
Merge pull request #191 from ngyn-rs/dev
Browse files Browse the repository at this point in the history
fix: rustc version compat for actions
  • Loading branch information
elcharitas authored Sep 9, 2024
2 parents 0e9acea + e1b3751 commit 0c0f06a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
17 changes: 14 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ on:
branches:
- dev
- main
workflow_dispatch:
inputs:
rustc_version:
description: "Rustc version"
required: true
default: "1.75.0"

jobs:
check:
Expand All @@ -16,7 +22,9 @@ jobs:
uses: actions/checkout@v2

- name: Install msrv toolchain
uses: dtolnay/[email protected]
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ github.event.inputs.rustc_version || '1.75.0' }}

- uses: Swatinem/rust-cache@v1

Expand All @@ -36,7 +44,9 @@ jobs:
uses: actions/checkout@v2

- name: Install msrv toolchain
uses: dtolnay/[email protected]
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ github.event.inputs.rustc_version || '1.75.0' }}

- uses: Swatinem/rust-cache@v1

Expand All @@ -58,9 +68,10 @@ jobs:
submodules: true

- name: Install msrv toolchain
uses: dtolnay/rust-toolchain@1.75.0
uses: dtolnay/rust-toolchain@master
with:
components: rustfmt, clippy
toolchain: ${{ github.event.inputs.rustc_version || '1.75.0' }}

- uses: Swatinem/rust-cache@v1

Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ on:
push:
branches: [main]
workflow_dispatch:
inputs:
rustc_version:
description: "Rustc version"
required: true
default: "1.75.0"

jobs:
crates_io_publish:
Expand All @@ -11,7 +16,9 @@ jobs:
timeout-minutes: 25
steps:
- uses: actions/checkout@v4
- uses: dtolnay/[email protected]
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ github.event.inputs.rustc_version }}

- name: cargo-release Cache
id: cargo_release_cache
Expand Down

0 comments on commit 0c0f06a

Please sign in to comment.