-
Notifications
You must be signed in to change notification settings - Fork 105
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove toolchain setup steps from our GitHub Actions workflows.
Rustup will not automatically install the correct targets, so we no longer need the `rustup target add` steps. After this, the `actions-rs/toolchain` step doesn't give us much, and is currently broken (actions-rs/toolchain#126), so I removed that step as well.
- Loading branch information
1 parent
ba262d5
commit cf02e5e
Showing
3 changed files
with
0 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,16 +10,8 @@ jobs: | |
- name: Checkout repository | ||
uses: actions/checkout@v2 | ||
|
||
- name: Install Rust toolchain | ||
uses: actions-rs/[email protected] | ||
with: | ||
profile: minimal | ||
|
||
- name: Install dependencies | ||
run: | | ||
rustup target add thumbv7em-none-eabi | ||
rustup target add riscv32imac-unknown-none-elf | ||
rustup target add riscv32imc-unknown-none-elf | ||
cargo install elf2tab --version 0.4.0 | ||
- name: Build Hello World | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,22 +31,12 @@ jobs: | |
with: | ||
submodules: true | ||
|
||
# Install a Rust toolchain with the components necessary to build | ||
# libtock-rs and its examples. This action doesn't seem to be able to | ||
# install toolchains for multiple targets, so I add the targets later in | ||
# the "Build and Test" step. | ||
- name: Install Rust toolchain | ||
uses: actions-rs/[email protected] | ||
with: | ||
profile: minimal | ||
|
||
# The main test step. We let the makefile do most of the work because the | ||
# makefile can be tested locally. We experimentally determined that -j2 is | ||
# optimal for the Azure Standard_DS2_v2 VM, which is the VM type used by | ||
# GitHub Actions at the time of this writing. | ||
- name: Build and Test | ||
run: | | ||
cd "${GITHUB_WORKSPACE}" | ||
rustup target add riscv32imc-unknown-none-elf thumbv7em-none-eabi | ||
make -j2 setup | ||
make -j2 test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,15 +29,6 @@ jobs: | |
- name: Clone repository | ||
uses: actions/[email protected] | ||
|
||
# Install a Rust toolchain with the components necessary to run | ||
# `print-sizes`. This action doesn't seem to be able to install toolchains | ||
# for multiple targets, so I add the targets later in the "size report" | ||
# step. | ||
- name: Install Rust toolchain | ||
uses: actions-rs/[email protected] | ||
with: | ||
profile: minimal | ||
|
||
# The main diff script. Stores the sizes of the example binaries for both | ||
# the merge commit and the target branch. We display the diff in a | ||
# separate step to make it easy to navigate to in the GitHub Actions UI. | ||
|
@@ -46,13 +37,11 @@ jobs: | |
UPSTREAM_REMOTE_NAME="${UPSTREAM_REMOTE_NAME:-origin}" | ||
GITHUB_BASE_REF="${GITHUB_BASE_REF:-master}" | ||
cd "${GITHUB_WORKSPACE}" | ||
rustup target add riscv32imc-unknown-none-elf thumbv7em-none-eabi | ||
make -j2 examples # The VM this runs on has 2 logical cores. | ||
cargo run --release -p print_sizes >'${{runner.temp}}/merge-sizes' | ||
git remote set-branches "${UPSTREAM_REMOTE_NAME}" "${GITHUB_BASE_REF}" | ||
git fetch --depth=1 "${UPSTREAM_REMOTE_NAME}" "${GITHUB_BASE_REF}" | ||
git checkout "${UPSTREAM_REMOTE_NAME}/${GITHUB_BASE_REF}" | ||
rustup target add riscv32imc-unknown-none-elf thumbv7em-none-eabi | ||
make -j2 examples | ||
cargo run --release -p print_sizes >'${{runner.temp}}/base-sizes' | ||
|