Skip to content

Commit

Permalink
Merge pull request #24 from kyoto7250/change_github_actions
Browse files Browse the repository at this point in the history
use dtolnay/rust-toolchain
  • Loading branch information
kyoto7250 authored Jun 16, 2024
2 parents 47b5bb7 + 0b24d96 commit e50c2ae
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 22 deletions.
14 changes: 4 additions & 10 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
Thank you for making zhobo better!

Here's a checklist for things that will be checked during review or continuous integration.

- \[ ] Added passing unit tests
- \[ ] `cargo test` passes locally. It takes much time.
- \[ ] Run `cargo fmt`

Delete this line and everything above before opening your PR.

- [x] Added passing unit tests
- [x] `cargo test` passes locally. It takes much time.
- [x] Run `cargo fmt`

---

*Please write a short comment explaining your change (or "none" for internal only changes)*

changelog:
12 changes: 5 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ jobs:
name: Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Cargo fmt
run: cargo fmt --all -- --check

lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Cache cargo registry
uses: actions/cache@v1
with:
Expand Down Expand Up @@ -91,14 +91,12 @@ jobs:
rust: stable
target: i686-pc-windows-msvc
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Install Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.rust }}
profile: minimal
override: true
target: ${{ matrix.target }}

- name: Use Cross
Expand All @@ -116,7 +114,7 @@ jobs:
echo "target dir is: ${{ env.TARGET_DIR }}"
- name: Cache Dependencies
uses: Swatinem/rust-cache@v1
uses: Swatinem/rust-cache@v2

- name: Build
run: ${{ env.CARGO }} build --verbose ${{ env.TARGET_FLAGS }}
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,9 @@ jobs:
fetch-depth: 1

- name: Install Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.rust }}
profile: minimal
override: true
target: ${{ matrix.target }}

- name: Use Cross
Expand Down Expand Up @@ -121,7 +119,7 @@ jobs:
fi
- name: Publish
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: ${{ env.ASSET }}
env:
Expand All @@ -135,7 +133,7 @@ jobs:
- uses: actions/checkout@v1

- name: Install cargo-workspaces
uses: actions-rs/[email protected]
uses: dtolnay/rust-toolchain@stable
with:
crate: cargo-workspaces

Expand Down

0 comments on commit e50c2ae

Please sign in to comment.