From 42f7106e03fab0ff141e4e035a87e43dca72eb4c Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Sun, 21 Jul 2024 18:11:15 -0400 Subject: [PATCH 1/2] Allow executing GitHub Actions on non-x86_64 hosts. Signed-off-by: Piotr Sikora --- .github/workflows/rust.yml | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3f753bfc..5d6fe831 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -100,10 +100,10 @@ jobs: - name: Install dependencies if: ${{ env.ACT }} run: | - curl -OL https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init - chmod +x ./rustup-init - ./rustup-init -y - rm rustup-init + curl -OL https://static.rust-lang.org/rustup/rustup-init.sh + chmod +x ./rustup-init.sh + ./rustup-init.sh -y --default-toolchain stable + rm rustup-init.sh echo "$HOME/.cargo/bin" >> $GITHUB_PATH - name: Update Rust @@ -148,10 +148,10 @@ jobs: - name: Install dependencies if: ${{ env.ACT }} run: | - curl -OL https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init - chmod +x ./rustup-init - ./rustup-init -y - rm rustup-init + curl -OL https://static.rust-lang.org/rustup/rustup-init.sh + chmod +x ./rustup-init.sh + ./rustup-init.sh -y --default-toolchain nightly + rm rustup-init.sh echo "$HOME/.cargo/bin" >> $GITHUB_PATH - name: Update Rust @@ -194,10 +194,10 @@ jobs: - name: Install dependencies if: ${{ env.ACT }} run: | - curl -OL https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init - chmod +x ./rustup-init - ./rustup-init -y - rm rustup-init + curl -OL https://static.rust-lang.org/rustup/rustup-init.sh + chmod +x ./rustup-init.sh + ./rustup-init.sh -y + rm rustup-init.sh echo "$HOME/.cargo/bin" >> $GITHUB_PATH export PATH=$PATH:$HOME/.cargo/bin cargo install cargo-outdated @@ -214,10 +214,10 @@ jobs: - name: Install dependencies if: ${{ env.ACT }} run: | - curl -OL https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init - chmod +x ./rustup-init - ./rustup-init -y - rm rustup-init + curl -OL https://static.rust-lang.org/rustup/rustup-init.sh + chmod +x ./rustup-init.sh + ./rustup-init.sh -y + rm rustup-init.sh echo "$HOME/.cargo/bin" >> $GITHUB_PATH export PATH=$PATH:$HOME/.cargo/bin cargo install cargo-audit @@ -253,10 +253,10 @@ jobs: - name: Install dependencies if: ${{ env.ACT }} run: | - curl -OL https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init - chmod +x ./rustup-init - ./rustup-init -y - rm rustup-init + curl -OL https://static.rust-lang.org/rustup/rustup-init.sh + chmod +x ./rustup-init.sh + ./rustup-init.sh -y + rm rustup-init.sh echo "$HOME/.cargo/bin" >> $GITHUB_PATH - name: Update Rust From 53a9c3061f66b0c7822959cdd0f3299e55cad892 Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Mon, 22 Jul 2024 19:30:20 -0400 Subject: [PATCH 2/2] review: fix the reactor job as well. Signed-off-by: Piotr Sikora --- .github/workflows/rust.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5d6fe831..5d76692e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -317,10 +317,10 @@ jobs: - name: Install dependencies if: ${{ env.ACT }} run: | - curl -OL https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init - chmod +x ./rustup-init - ./rustup-init -y - rm rustup-init + curl -OL https://static.rust-lang.org/rustup/rustup-init.sh + chmod +x ./rustup-init.sh + ./rustup-init.sh -y + rm rustup-init.sh echo "$HOME/.cargo/bin" >> $GITHUB_PATH - name: Update Rust