diff options
| author | Rina Fujino <18257209+rina23q@users.noreply.github.com> | 2022-07-29 10:08:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 10:08:49 +0200 |
| commit | 7e29063c59ab37d75333c68ead11cd369562d343 (patch) | |
| tree | 006626a9ed623a08ce860f15d0f324b57f9ca570 | |
| parent | 64d300de6b872821e9f435908b941bdd5f191df1 (diff) | |
| parent | d4a4a6af8f200680a79d84fb36ccdcde9eb0286e (diff) | |
Merge pull request #1303 from matthiasbeyer/remove-action-rs
Replace actions-rs/toolchain with dtolnay/rust-toolchain
| -rw-r--r-- | .github/workflows/build-workflow.yml | 13 | ||||
| -rw-r--r-- | .github/workflows/ci_pipeline.yml | 25 | ||||
| -rw-r--r-- | .github/workflows/pull-request-checks.yml | 35 |
3 files changed, 16 insertions, 57 deletions
diff --git a/.github/workflows/build-workflow.yml b/.github/workflows/build-workflow.yml index dde0403b..d45936bd 100644 --- a/.github/workflows/build-workflow.yml +++ b/.github/workflows/build-workflow.yml @@ -19,11 +19,7 @@ jobs: uses: actions/checkout@v3 - name: Enable toolchain via github action - # https://github.com/actions-rs/toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.58.1 - override: true + uses: dtolnay/rust-toolchain@1.58.1 - name: Enable cache # https://github.com/marketplace/actions/rust-cache @@ -59,12 +55,9 @@ jobs: uses: actions/checkout@v3 - name: Enable toolchain via github action - # https://github.com/actions-rs/toolchain - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@1.58.1 with: - toolchain: 1.58.1 - target: ${{ matrix.target }} - override: true + targets: ${{ matrix.target }} - name: Enable cache # https://github.com/marketplace/actions/rust-cache diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml index 7e3fda30..1eace320 100644 --- a/.github/workflows/ci_pipeline.yml +++ b/.github/workflows/ci_pipeline.yml @@ -28,11 +28,7 @@ jobs: uses: actions/checkout@v3 - name: Enable toolchain via github action - # https://github.com/actions-rs/toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.58.1 - override: true + uses: dtolnay/rust-toolchain@1.58.1 - name: Enable cache # https://github.com/marketplace/actions/rust-cache @@ -84,10 +80,7 @@ jobs: uses: actions/checkout@v3 - name: Enable toolchain via github action - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.58.1 - override: true + uses: dtolnay/rust-toolchain@1.58.1 - name: Enable cache # https://github.com/marketplace/actions/rust-cache @@ -100,12 +93,7 @@ jobs: # The tests could fail if GitHub blocks external connections. # It seems like they rarely do. - name: Cargo test features - uses: actions-rs/cargo@v1 - # https://github.com/marketplace/actions/rust-cargo - with: - command: test - args: --verbose --features integration-test,requires-sudo -- \ - --skip sending_and_receiving_a_message + run: cargo test --verbose --features integration-test,requires-sudo -- --skip sending_and_receiving_a_message ################################################################################## @@ -129,12 +117,9 @@ jobs: uses: actions/checkout@v3 - name: Enable toolchain via github action - # https://github.com/actions-rs/toolchain - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@1.58.1 with: - toolchain: 1.58.1 - target: ${{ matrix.target }} - override: true + targets: ${{ matrix.target }} - name: Enable cache # https://github.com/marketplace/actions/rust-cache diff --git a/.github/workflows/pull-request-checks.yml b/.github/workflows/pull-request-checks.yml index 6a5abbab..fadab059 100644 --- a/.github/workflows/pull-request-checks.yml +++ b/.github/workflows/pull-request-checks.yml @@ -51,10 +51,7 @@ jobs: if: ${{ needs.changes.outputs.rust == 'true' || needs.changes.outputs.workflows == 'true' }} steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - override: true + - uses: dtolnay/rust-toolchain@nightly - name: Run cargo-udeps uses: aig787/cargo-udeps-action@v1 with: @@ -139,11 +136,9 @@ jobs: uses: actions/checkout@v3 - name: enable toolchain via github action - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@1.58.1 with: - toolchain: 1.58.1 components: rustfmt, clippy - override: true - name: Enable cache # https://github.com/marketplace/actions/rust-cache @@ -191,10 +186,7 @@ jobs: uses: actions/checkout@v3 - name: enable toolchain via github action - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.58.1 - override: true + uses: dtolnay/rust-toolchain@1.58.1 - name: Enable cache # https://github.com/marketplace/actions/rust-cache @@ -230,10 +222,7 @@ jobs: uses: actions/checkout@v3 - name: enable toolchain via github action - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.58.1 - override: true + uses: dtolnay/rust-toolchain@1.58.1 - name: Enable cache # https://github.com/marketplace/actions/rust-cache @@ -262,11 +251,9 @@ jobs: uses: actions/checkout@v3 - name: enable toolchain via github action - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@1.58.1 with: - toolchain: 1.58.1 - target: armv7-unknown-linux-gnueabihf - override: true + targets: armv7-unknown-linux-gnueabihf - name: Enable cache # https://github.com/marketplace/actions/rust-cache @@ -290,12 +277,9 @@ jobs: uses: actions/checkout@v3 - name: enable toolchain via github action - # https://github.com/actions-rs/toolchain - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@1.58.1 with: - toolchain: 1.58.1 target: armv7-unknown-linux-gnueabihf - override: true - name: Enable cache # https://github.com/marketplace/actions/rust-cache @@ -319,10 +303,7 @@ jobs: # uses: actions/checkout@v3 # # - name: Install rust v1.58.1 -# uses: actions-rs/toolchain@v1 -# with: -# toolchain: 1.58.1 -# override: true +# uses: dtolnay/rust-toolchain@1.58.1 # # - name: Enable cache # # https://github.com/marketplace/actions/rust-cache |