Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,21 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: "Install rust"
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
targets: ${{ matrix.this.target }}
# Docker container doesn't come with rustup
- name: "Install rustup"
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
echo "$HOME/.cargo/bin" >> $GITHUB_PATH

- name: "Report rust toolchain"
run: rustup show
- name: "Install rust toolchain (rust-toolchain.toml)"
run: |
rustup toolchain install
rustup show

- name: "Install rust target"
run: |
rustup target add ${{ matrix.this.target }}
rustup target list --installed

- name: "Build"
run: cargo build --release --locked --target ${{ matrix.this.target }} -p air
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/build-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: "Install rust"
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
targets: ${{ matrix.this.target }}
- name: "Install rust toolchain (rust-toolchain.toml)"
run: |
rustup toolchain install
rustup show

- name: "Report rust toolchain"
run: rustup show
- name: "Install rust target"
run: |
rustup target add ${{ matrix.this.target }}
rustup target list --installed

- name: "Build"
run: cargo build --release --locked --target ${{ matrix.this.target }} -p air
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: "Install rust"
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
targets: ${{ matrix.this.target }}
- name: "Install rust toolchain (rust-toolchain.toml)"
run: |
rustup toolchain install
rustup show

- name: "Report rust toolchain"
run: rustup show
- name: "Install rust target"
run: |
rustup target add ${{ matrix.this.target }}
rustup target list --installed

- name: "Build"
run: cargo build --release --locked --target ${{ matrix.this.target }} -p air
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ jobs:
run: |
sudo apt-get update

- name: Report rust toolchain
run: rustup show
- name: Install rust toolchain (rust-toolchain.toml)
run: |
rustup toolchain install
rustup show

- name: Rust cache
uses: Swatinem/rust-cache@v2
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,18 @@ jobs:
timeout-minutes: 30
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RUSTUP_TOOLCHAIN: ${{ matrix.config.rust == 'nightly' && 'nightly' || '' }}
steps:
- uses: actions/checkout@v4

- name: Update build environment
run: |
sudo apt-get update

- name: Install nightly rust
uses: dtolnay/rust-toolchain@nightly
if: matrix.config.rust == 'nightly'

- name: Report rust toolchain
run: rustup show
- name: Install rust toolchain (rust-toolchain.toml / RUSTUP_TOOLCHAIN)
run: |
rustup toolchain install
rustup show

- name: Rust cache
uses: Swatinem/rust-cache@v2
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/test-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,19 @@ on:
jobs:
macos:
runs-on: macos-latest
name: "Rust: ${{ matrix.config.rust }}"
name: "Rust: stable"
strategy:
fail-fast: false
matrix:
config:
- { rust: 'stable' }
timeout-minutes: 30
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v4

- name: Report rust toolchain
run: rustup show
- name: Install rust toolchain (rust-toolchain.toml)
run: |
rustup toolchain install
rustup show

- name: Rust cache
uses: Swatinem/rust-cache@v2
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,19 @@ on:
jobs:
windows:
runs-on: windows-latest
name: "Rust: ${{ matrix.config.rust }}"
name: "Rust: stable"
strategy:
fail-fast: false
matrix:
config:
- { rust: 'stable' }
timeout-minutes: 30
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v4

- name: Report rust toolchain
run: rustup show
- name: Install rust toolchain (rust-toolchain.toml)
run: |
rustup toolchain install
rustup show

- name: Rust cache
uses: Swatinem/rust-cache@v2
Expand Down
Loading