Skip to content

Commit

Permalink
Fix error in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
mondeja committed Nov 1, 2023
1 parent 111d306 commit 549e28c
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 25 deletions.
14 changes: 14 additions & 0 deletions .github/actions/get-toolchain/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Get Rust toolchain configuration
description: Get the Rust toolchain configuration for the current project defined in the `rust-toolchain` file
outputs:
channel:
description: The Rust toolchain channel
value: ${{ steps.get-toolchain.outputs.channel }}
runs:
using: composite
steps:
- id: get-toolchain
shell: sh
run: |
echo "channel=$(grep channel -i rust-toolchain.toml | cut -d '"' -f2)" \
>> $GITHUB_OUTPUT
4 changes: 2 additions & 2 deletions .github/workflows/auto-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:
persist-credentials: false
- name: Get toolchain config
id: toolchain
uses: ./.github/workflows/get-toolchain.yml
uses: ./.github/actions/get-toolchain
- name: Setup Rust nightly
uses: hecrj/setup-rust-action@v2
with:
rust-version: ${{ steps.toolchain.outputs.rust-version }}
rust-version: ${{ steps.toolchain.outputs.channel }}
targets: wasm32-unknown-unknown
profile: minimal
- name: Cache Rust dependencies
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/get-toolchain.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ jobs:
uses: actions/checkout@v4
- name: Get toolchain config
id: toolchain
uses: ./.github/workflows/get-toolchain.yml
uses: ./.github/actions/get-toolchain
- name: Setup Rust
uses: hecrj/setup-rust-action@v2
with:
rust-version: ${{ steps.toolchain.outputs.rust-version }}
rust-version: ${{ steps.toolchain.outputs.channel }}
targets: wasm32-unknown-unknown
profile: ${{ matrix.command == 'test' && 'minimal' || 'default' }}
- name: Cache Rust dependencies
Expand Down

0 comments on commit 549e28c

Please sign in to comment.