Skip to content

Install toolchain before doing anything #2023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 4, 2025
Merged

Install toolchain before doing anything #2023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c598c95
Install toolchain before doing anything
mkeeter Mar 4, 2025
4c733e6
Also fix buildomat
mkeeter Mar 4, 2025
4bafeb5
...and buildomat RoT
mkeeter Mar 4, 2025
d59a44c
ahhhhhhh
mkeeter Mar 4, 2025
ac2d130
ahhhhhhhhhhh
mkeeter Mar 4, 2025
7d630b7
Also fix permslip
mkeeter Mar 4, 2025
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
1 change: 1 addition & 0 deletions .github/buildomat/build-one.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ name=$1
toml=$2
image=$3

rustup toolchain install
cargo xtask dist $toml
cp target/$name/dist/$image/build-$name-image-$image.zip /work/
touch /work/this_is_not_signed.txt
1 change: 1 addition & 0 deletions .github/buildomat/jobs/rot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ trap _cleanup SIGINT SIGTERM EXIT
source .github/buildomat/force-git-over-https.sh
source .github/buildomat/permslip-setup.sh

rustup toolchain install

cargo xtask dist app/oxide-rot-1/app-dev.toml
$PERMSLIP_DIR/target/release/permslip --url=http://localhost:41340 \
Expand Down
1 change: 1 addition & 0 deletions .github/buildomat/permslip-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ BART_KEY=$(pwd)/support/fake_certs/fake_private_key.pem
mkdir -p $PERMSLIP_DIR
git clone https://github.com/oxidecomputer/permission-slip.git -b ssh_key_fix $PERMSLIP_DIR
pushd $PERMSLIP_DIR
rustup toolchain install
cargo build --release
export POSTGRES_HOST=localhost
export POSTGRES_PORT=5432
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-one.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
# install rust toolchain
- name: Install Rust toolchain
run: |
rustup show active-toolchain || rustup toolchain install
rustup show
rustup component add clippy

Expand Down