Skip to content

Commit

Permalink
Use maintained toolchain install action
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Farr <[email protected]>
  • Loading branch information
Xtansia committed Aug 29, 2024
1 parent c116245 commit 3ff6789
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 20 deletions.
3 changes: 1 addition & 2 deletions .github/actions/setup-rust-tools/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ runs:
using: composite
steps:
- name: Install latest stable toolchain
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
components: rustfmt, clippy, llvm-tools-preview

- name: Install cargo-make
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ jobs:
ref: ${{ github.event.inputs.branch }}

- name: Install latest stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
uses: dtolnay/rust-toolchain@stable

- name: Install cargo-make
uses: davidB/rust-cargo-make@v1
Expand Down Expand Up @@ -79,9 +77,7 @@ jobs:
token: ${{ steps.app-token.outputs.token }}

- name: Install latest stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
uses: dtolnay/rust-toolchain@stable

- name: Install cargo-make
uses: davidB/rust-cargo-make@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog_verifier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
verify-changelog:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/clippy_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ jobs:
runs-on: ubuntu-latest
if: github.actor != 'dependabot[bot]'
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly
components: clippy
override: true
- uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
installation_id: 22958780

- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ steps.github_app_token.outputs.token }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: lychee Link Checker
id: lychee
uses: lycheeverse/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
issues: write
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- id: get_data
run: |
echo "approvers=$(cat .github/CODEOWNERS | grep @ | tr -d '* ' | sed 's/@/,/g' | sed 's/,//1')" >> $GITHUB_OUTPUT
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Rust Client
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: client

Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
secured: [true, false]
steps:
- name: Checkout Rust Client
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: client

Expand Down Expand Up @@ -148,15 +148,15 @@ jobs:
installation_id: 22958780

- name: Checkout Rust Client
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: client

- name: Setup Rust tools
uses: ./client/.github/actions/setup-rust-tools

- name: Checkout OpenSearch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: opensearch-project/opensearch
ref: ${{ matrix.opensearch_ref }}
Expand Down

0 comments on commit 3ff6789

Please sign in to comment.