From c598c95f3237d3b0e644e6cfc16dff56e310a6e5 Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Tue, 4 Mar 2025 10:02:18 -0800 Subject: [PATCH 1/6] Install toolchain before doing anything --- .github/workflows/build-one.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-one.yml b/.github/workflows/build-one.yml index 90810c957a..cb3d6c7299 100644 --- a/.github/workflows/build-one.yml +++ b/.github/workflows/build-one.yml @@ -40,6 +40,7 @@ jobs: # install rust toolchain - name: Install Rust toolchain run: | + rustup toolchain install rustup show rustup component add clippy From 4c733e638387c66b5736c9b303b3978e3cb8dea7 Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Tue, 4 Mar 2025 10:04:51 -0800 Subject: [PATCH 2/6] Also fix buildomat --- .github/buildomat/build-one.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/buildomat/build-one.sh b/.github/buildomat/build-one.sh index a999a36126..6ad2208f20 100755 --- a/.github/buildomat/build-one.sh +++ b/.github/buildomat/build-one.sh @@ -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 From 4bafeb56a874a4bf3f749f5999c3c35db7986219 Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Tue, 4 Mar 2025 10:06:02 -0800 Subject: [PATCH 3/6] ...and buildomat RoT --- .github/buildomat/jobs/rot.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/buildomat/jobs/rot.sh b/.github/buildomat/jobs/rot.sh index e7032fab3d..f0fbf6983d 100755 --- a/.github/buildomat/jobs/rot.sh +++ b/.github/buildomat/jobs/rot.sh @@ -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 \ From d59a44c79e5f954a0e9a9ca747dffb84a7c73b9a Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Tue, 4 Mar 2025 10:11:29 -0800 Subject: [PATCH 4/6] ahhhhhhh --- .github/buildomat/build-one.sh | 2 +- .github/buildomat/jobs/rot.sh | 2 +- .github/workflows/build-one.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/buildomat/build-one.sh b/.github/buildomat/build-one.sh index 6ad2208f20..a1efb3f3af 100755 --- a/.github/buildomat/build-one.sh +++ b/.github/buildomat/build-one.sh @@ -9,7 +9,7 @@ name=$1 toml=$2 image=$3 -rustup toolchain install +rustup show active-toolchain || 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 diff --git a/.github/buildomat/jobs/rot.sh b/.github/buildomat/jobs/rot.sh index f0fbf6983d..10470130cc 100755 --- a/.github/buildomat/jobs/rot.sh +++ b/.github/buildomat/jobs/rot.sh @@ -25,7 +25,7 @@ trap _cleanup SIGINT SIGTERM EXIT source .github/buildomat/force-git-over-https.sh source .github/buildomat/permslip-setup.sh -rustup toolchain install +rustup show active-toolchain || rustup toolchain install cargo xtask dist app/oxide-rot-1/app-dev.toml $PERMSLIP_DIR/target/release/permslip --url=http://localhost:41340 \ diff --git a/.github/workflows/build-one.yml b/.github/workflows/build-one.yml index cb3d6c7299..ecfe8fc1c3 100644 --- a/.github/workflows/build-one.yml +++ b/.github/workflows/build-one.yml @@ -40,7 +40,7 @@ jobs: # install rust toolchain - name: Install Rust toolchain run: | - rustup toolchain install + rustup show active-toolchain || rustup toolchain install rustup show rustup component add clippy From ac2d1308f13c5cd7e1d1252d4d30fd8e8ec1dc71 Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Tue, 4 Mar 2025 10:23:08 -0800 Subject: [PATCH 5/6] ahhhhhhhhhhh --- .github/buildomat/build-one.sh | 2 +- .github/buildomat/jobs/rot.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/buildomat/build-one.sh b/.github/buildomat/build-one.sh index a1efb3f3af..6ad2208f20 100755 --- a/.github/buildomat/build-one.sh +++ b/.github/buildomat/build-one.sh @@ -9,7 +9,7 @@ name=$1 toml=$2 image=$3 -rustup show active-toolchain || rustup toolchain install +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 diff --git a/.github/buildomat/jobs/rot.sh b/.github/buildomat/jobs/rot.sh index 10470130cc..f0fbf6983d 100755 --- a/.github/buildomat/jobs/rot.sh +++ b/.github/buildomat/jobs/rot.sh @@ -25,7 +25,7 @@ trap _cleanup SIGINT SIGTERM EXIT source .github/buildomat/force-git-over-https.sh source .github/buildomat/permslip-setup.sh -rustup show active-toolchain || rustup toolchain install +rustup toolchain install cargo xtask dist app/oxide-rot-1/app-dev.toml $PERMSLIP_DIR/target/release/permslip --url=http://localhost:41340 \ From 7d630b7be91f12688166db3b95a6a40a231ba1f9 Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Tue, 4 Mar 2025 10:32:26 -0800 Subject: [PATCH 6/6] Also fix permslip --- .github/buildomat/permslip-setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/buildomat/permslip-setup.sh b/.github/buildomat/permslip-setup.sh index 95833abfc7..123e357119 100644 --- a/.github/buildomat/permslip-setup.sh +++ b/.github/buildomat/permslip-setup.sh @@ -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