Skip to content

Commit

Permalink
ci: use rustup command to install recommended version
Browse files Browse the repository at this point in the history
  • Loading branch information
metaclips authored and etorreborre committed Apr 1, 2024
1 parent d868c45 commit ff700eb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
9 changes: 5 additions & 4 deletions .github/actions/build_binaries/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ inputs:
runs:
using: composite
steps:
- uses: dtolnay/rust-toolchain@78c6b5541adb5849f5d72d15da722aedb26327ca # Stable branch
with:
toolchain: ${{ inputs.toolchain }}
target: ${{ inputs.target }}
- shell: bash
run: |
# This will allow us update to rust version indicated in our rust-toolchain.toml file
rustup show
rustup target add ${{ inputs.target }}
- shell: bash
if: inputs.platform_operating_system == 'ubuntu-22.04'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-draft-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -371,10 +371,10 @@ jobs:
ref: ${{ github.event.inputs.release_branch }}

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@78c6b5541adb5849f5d72d15da722aedb26327ca # Stable branch
with:
toolchain: stable
target: ${{ matrix.job.target }}
run: |
# This will allow us update to rust version indicated in our rust-toolchain.toml file
rustup show
rustup target add ${{ matrix.job.target }}
- name: Install Cross
if: matrix.job.use-cross == true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,12 @@ jobs:
build: [linux_armv7, macos_silicon]
include:
- build: linux_armv7
os: ubuntu-20.04
os: ubuntu-22.04
toolchain: stable
target: armv7-unknown-linux-musleabihf
use-cross-build: true
- build: macos_silicon
os: macos-13
os: macos-14
toolchain: stable
target: aarch64-apple-darwin
use-cross-build: false
Expand Down

0 comments on commit ff700eb

Please sign in to comment.