From e1ca4b721da459878e60e8e23340aafc9636f6d7 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 3 Mar 2025 15:10:11 -0500 Subject: [PATCH 01/10] Fix rustup toolchain errors --- dev/release/verify-release-candidate.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh index 2c0bd216b3ac9..a053569dcb249 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -117,8 +117,11 @@ test_source_distribution() { # build and test rust + # install the needed version of rust defined in rust-toolchain.toml + rustup toolchain install + # raises on any formatting errors - rustup component add rustfmt --toolchain stable + rustup component add rustfmt cargo fmt --all -- --check # Clone testing repositories into the expected location From 18e6dde1d0fecec8f83f7c3de6ecae794868b43e Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 3 Mar 2025 15:15:10 -0500 Subject: [PATCH 02/10] Use standard builder setup in extended tests --- .github/workflows/extended.yml | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/extended.yml b/.github/workflows/extended.yml index 3f882d7a3a821..cbecd62c9cf65 100644 --- a/.github/workflows/extended.yml +++ b/.github/workflows/extended.yml @@ -28,8 +28,11 @@ concurrency: # # We still run them as they provide important coverage to ensure correctness # in the (very rare) event of a hash failure or sqlite library query failure. -on: - push: + +# TEMP for testing +on: [push, pull_request] +# on: +# push: jobs: # Check crate compiles and base cargo check passes @@ -37,17 +40,14 @@ jobs: name: linux build test runs-on: ubuntu-latest steps: + - name: Setup Rust toolchain + uses: ./.github/actions/setup-builder + with: + rust-version: stable - uses: actions/checkout@v4 with: submodules: true fetch-depth: 1 - - name: Install Rust - run: | - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - source $HOME/.cargo/env - rustup default stable - - name: Install Protobuf Compiler - run: sudo apt-get install -y protobuf-compiler - name: Prepare cargo build run: | cargo check --profile ci --all-targets @@ -65,13 +65,10 @@ jobs: fetch-depth: 1 - name: Free Disk Space (Ubuntu) uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be - - name: Install Rust - run: | - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - source $HOME/.cargo/env - rustup default stable - - name: Install Protobuf Compiler - run: sudo apt-get install -y protobuf-compiler + - name: Setup Rust toolchain + uses: ./.github/actions/setup-builder + with: + rust-version: stable # For debugging, test binaries can be large. - name: Show available disk space run: | From 438b582bad203d1619f6a66206af364efafd8420 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 3 Mar 2025 15:18:32 -0500 Subject: [PATCH 03/10] fix yaml --- .github/workflows/extended.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/extended.yml b/.github/workflows/extended.yml index cbecd62c9cf65..8646a6baed2aa 100644 --- a/.github/workflows/extended.yml +++ b/.github/workflows/extended.yml @@ -40,14 +40,14 @@ jobs: name: linux build test runs-on: ubuntu-latest steps: - - name: Setup Rust toolchain - uses: ./.github/actions/setup-builder - with: - rust-version: stable - uses: actions/checkout@v4 with: submodules: true fetch-depth: 1 + - name: Setup Rust toolchain + uses: ./.github/actions/setup-builder + with: + rust-version: stable - name: Prepare cargo build run: | cargo check --profile ci --all-targets From 0ed0e0ab5ad7f904cb6fb93c57fd063e5911ffc6 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 3 Mar 2025 15:34:34 -0500 Subject: [PATCH 04/10] sprinkle sudo --- .github/actions/setup-builder/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-builder/action.yaml b/.github/actions/setup-builder/action.yaml index 22d2f2187dd07..b5f50a9c0b512 100644 --- a/.github/actions/setup-builder/action.yaml +++ b/.github/actions/setup-builder/action.yaml @@ -29,8 +29,8 @@ runs: shell: bash run: | RETRY=("ci/scripts/retry" timeout 120) - "${RETRY[@]}" apt-get update - "${RETRY[@]}" apt-get install -y protobuf-compiler + "${RETRY[@]}" sudo apt-get update + "${RETRY[@]}" sudo apt-get install -y protobuf-compiler - name: Setup Rust toolchain shell: bash # rustfmt is needed for the substrait build script From 166cad9683c776c810d9e3625bcefcd3f2ec6d77 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 3 Mar 2025 15:37:51 -0500 Subject: [PATCH 05/10] Revert "sprinkle sudo" This reverts commit 0ed0e0ab5ad7f904cb6fb93c57fd063e5911ffc6. --- .github/actions/setup-builder/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-builder/action.yaml b/.github/actions/setup-builder/action.yaml index b5f50a9c0b512..22d2f2187dd07 100644 --- a/.github/actions/setup-builder/action.yaml +++ b/.github/actions/setup-builder/action.yaml @@ -29,8 +29,8 @@ runs: shell: bash run: | RETRY=("ci/scripts/retry" timeout 120) - "${RETRY[@]}" sudo apt-get update - "${RETRY[@]}" sudo apt-get install -y protobuf-compiler + "${RETRY[@]}" apt-get update + "${RETRY[@]}" apt-get install -y protobuf-compiler - name: Setup Rust toolchain shell: bash # rustfmt is needed for the substrait build script From a20cd82e715b9a1e883422ea8893cfe7d7e00db6 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 3 Mar 2025 15:38:13 -0500 Subject: [PATCH 06/10] no contianer --- .github/workflows/extended.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/extended.yml b/.github/workflows/extended.yml index 8646a6baed2aa..eedc5b5b8f2d4 100644 --- a/.github/workflows/extended.yml +++ b/.github/workflows/extended.yml @@ -86,8 +86,6 @@ jobs: hash-collisions: name: cargo test hash collisions (amd64) runs-on: ubuntu-latest - container: - image: amd64/rust steps: - uses: actions/checkout@v4 with: From 6a390baf9cea57c4c788747e95651d706ae6f6d0 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 3 Mar 2025 15:41:05 -0500 Subject: [PATCH 07/10] use rust container --- .github/workflows/extended.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/extended.yml b/.github/workflows/extended.yml index eedc5b5b8f2d4..e5ac6ce22fdbc 100644 --- a/.github/workflows/extended.yml +++ b/.github/workflows/extended.yml @@ -39,6 +39,8 @@ jobs: linux-build-lib: name: linux build test runs-on: ubuntu-latest + container: + image: amd64/rust steps: - uses: actions/checkout@v4 with: @@ -58,6 +60,8 @@ jobs: name: cargo test 'extended_tests' (amd64) needs: linux-build-lib runs-on: ubuntu-latest + container: + image: amd64/rust steps: - uses: actions/checkout@v4 with: @@ -86,6 +90,8 @@ jobs: hash-collisions: name: cargo test hash collisions (amd64) runs-on: ubuntu-latest + container: + image: amd64/rust steps: - uses: actions/checkout@v4 with: From eea398c8a52eb124508075ac8f6846f785927de7 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 3 Mar 2025 16:17:55 -0500 Subject: [PATCH 08/10] fix extended jobs --- .github/workflows/extended.yml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/extended.yml b/.github/workflows/extended.yml index e5ac6ce22fdbc..c00a59b97a871 100644 --- a/.github/workflows/extended.yml +++ b/.github/workflows/extended.yml @@ -39,17 +39,19 @@ jobs: linux-build-lib: name: linux build test runs-on: ubuntu-latest - container: - image: amd64/rust + # note: do not use amd/rust container to preserve disk space steps: - uses: actions/checkout@v4 with: submodules: true fetch-depth: 1 - - name: Setup Rust toolchain - uses: ./.github/actions/setup-builder - with: - rust-version: stable + - name: Install Rust + run: | + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + source $HOME/.cargo/env + rustup toolchain default + - name: Install Protobuf Compiler + run: sudo apt-get install -y protobuf-compiler - name: Prepare cargo build run: | cargo check --profile ci --all-targets @@ -60,8 +62,7 @@ jobs: name: cargo test 'extended_tests' (amd64) needs: linux-build-lib runs-on: ubuntu-latest - container: - image: amd64/rust + # note: do not use amd/rust container to preserve disk space steps: - uses: actions/checkout@v4 with: @@ -69,10 +70,13 @@ jobs: fetch-depth: 1 - name: Free Disk Space (Ubuntu) uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be - - name: Setup Rust toolchain - uses: ./.github/actions/setup-builder - with: - rust-version: stable + - name: Install Rust + run: | + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + source $HOME/.cargo/env + rustup toolchain install + - name: Install Protobuf Compiler + run: sudo apt-get install -y protobuf-compiler # For debugging, test binaries can be large. - name: Show available disk space run: | From 509adcdc4940fc80eeb6ce81b1f6a19cacc00ac1 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 3 Mar 2025 16:18:52 -0500 Subject: [PATCH 09/10] fix --- .github/workflows/extended.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/extended.yml b/.github/workflows/extended.yml index c00a59b97a871..0cd40e3757039 100644 --- a/.github/workflows/extended.yml +++ b/.github/workflows/extended.yml @@ -49,7 +49,7 @@ jobs: run: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y source $HOME/.cargo/env - rustup toolchain default + rustup toolchain install - name: Install Protobuf Compiler run: sudo apt-get install -y protobuf-compiler - name: Prepare cargo build From 96b63db466952f3a95a5545c887f06fef5775918 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 3 Mar 2025 20:04:14 -0500 Subject: [PATCH 10/10] Update .github/workflows/extended.yml --- .github/workflows/extended.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/extended.yml b/.github/workflows/extended.yml index 0cd40e3757039..1ad1c36e1aa7a 100644 --- a/.github/workflows/extended.yml +++ b/.github/workflows/extended.yml @@ -28,11 +28,8 @@ concurrency: # # We still run them as they provide important coverage to ensure correctness # in the (very rare) event of a hash failure or sqlite library query failure. - -# TEMP for testing -on: [push, pull_request] -# on: -# push: +on: + push: jobs: # Check crate compiles and base cargo check passes