From 3752ac67ca4961ef332091e375561c6af3e6fb9b Mon Sep 17 00:00:00 2001 From: Brian Myers Date: Wed, 11 Mar 2026 18:11:11 -0500 Subject: [PATCH] turn off submodule updating --- .github/actions/setup-submodules/action.yaml | 15 ++++++++ .github/workflows/dependencies.yml | 3 +- .github/workflows/docs_pr.yaml | 3 +- .github/workflows/extended.yml | 37 ++++++++++++++++++-- .github/workflows/rust.yml | 36 ++++++++++++------- .gitmodules | 3 ++ 6 files changed, 80 insertions(+), 17 deletions(-) create mode 100644 .github/actions/setup-submodules/action.yaml diff --git a/.github/actions/setup-submodules/action.yaml b/.github/actions/setup-submodules/action.yaml new file mode 100644 index 000000000000..28f3c08052b8 --- /dev/null +++ b/.github/actions/setup-submodules/action.yaml @@ -0,0 +1,15 @@ +name: "Setup Submodules" +description: "Initialize and update git submodules for testing" +runs: + using: "composite" + steps: + - name: Initialize and update submodules + shell: bash + run: | + git config --global --add safe.directory $GITHUB_WORKSPACE + git submodule init + # Override update=none setting for CI + git config submodule.testing.update checkout + git config submodule.parquet-testing.update checkout + git config submodule.datafusion-testing.update checkout + git submodule update --depth 1 diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 2f3a127ef98c..ab8803ede053 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -43,8 +43,9 @@ jobs: steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain uses: ./.github/actions/setup-builder with: diff --git a/.github/workflows/docs_pr.yaml b/.github/workflows/docs_pr.yaml index 4b8d25b0611e..7726ccd0ea14 100644 --- a/.github/workflows/docs_pr.yaml +++ b/.github/workflows/docs_pr.yaml @@ -44,8 +44,9 @@ jobs: steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup uv uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0 - name: Install doc dependencies diff --git a/.github/workflows/extended.yml b/.github/workflows/extended.yml index a143cb49fd35..eaed0b215cb2 100644 --- a/.github/workflows/extended.yml +++ b/.github/workflows/extended.yml @@ -57,6 +57,34 @@ permissions: checks: write jobs: + + # Check crate compiles and base cargo check passes + linux-build-lib: + name: linux build test + runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=8,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }} + # note: do not use amd/rust container to preserve disk space + steps: + - uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push + fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules + - 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 update + sudo apt-get install -y protobuf-compiler + - name: Prepare cargo build + run: | + cargo check --profile ci --all-targets + cargo clean + # Run extended tests (with feature 'extended_tests') linux-test-extended: name: cargo test 'extended_tests' (amd64) @@ -67,8 +95,9 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Free Disk Space (Ubuntu) uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 - name: Install Rust @@ -114,8 +143,9 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain uses: ./.github/actions/setup-builder with: @@ -136,8 +166,9 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules # Don't use setup-builder to avoid configuring RUST_BACKTRACE which is expensive - name: Install protobuf compiler run: | diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5ff1f6467bbf..569f83c519d4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -279,8 +279,9 @@ jobs: - uses: runs-on/action@d141ef83eb66d096ce8afc767e09115a65c63b60 # v2.1.2 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain uses: ./.github/actions/setup-builder with: @@ -325,8 +326,9 @@ jobs: - uses: runs-on/action@d141ef83eb66d096ce8afc767e09115a65c63b60 # v2.1.2 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain run: rustup toolchain install stable - name: Rust Dependency Cache @@ -357,8 +359,9 @@ jobs: - uses: runs-on/action@d141ef83eb66d096ce8afc767e09115a65c63b60 # v2.1.2 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain uses: ./.github/actions/setup-builder with: @@ -388,8 +391,9 @@ jobs: - uses: runs-on/action@d141ef83eb66d096ce8afc767e09115a65c63b60 # v2.1.2 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain uses: ./.github/actions/setup-builder with: @@ -451,8 +455,9 @@ jobs: - uses: runs-on/action@d141ef83eb66d096ce8afc767e09115a65c63b60 # v2.1.2 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain uses: ./.github/actions/setup-builder with: @@ -499,8 +504,9 @@ jobs: - uses: runs-on/action@d141ef83eb66d096ce8afc767e09115a65c63b60 # v2.1.2 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain uses: ./.github/actions/setup-builder with: @@ -524,8 +530,9 @@ jobs: - uses: runs-on/action@d141ef83eb66d096ce8afc767e09115a65c63b60 # v2.1.2 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain uses: ./.github/actions/setup-builder with: @@ -567,8 +574,9 @@ jobs: steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain uses: ./.github/actions/setup-macos-aarch64-builder - name: Run datafusion-ffi tests @@ -660,8 +668,9 @@ jobs: - uses: runs-on/action@d141ef83eb66d096ce8afc767e09115a65c63b60 # v2.1.2 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain uses: ./.github/actions/setup-builder with: @@ -685,8 +694,9 @@ jobs: steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain uses: ./.github/actions/setup-builder with: @@ -707,8 +717,9 @@ jobs: - uses: runs-on/action@d141ef83eb66d096ce8afc767e09115a65c63b60 # v2.1.2 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Setup Rust toolchain uses: ./.github/actions/setup-builder with: @@ -742,8 +753,9 @@ jobs: steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - submodules: true fetch-depth: 1 + - name: Setup Submodules + uses: ./.github/actions/setup-submodules - name: Mark repository as safe for git # Required for git commands inside container (avoids "dubious ownership" error) diff --git a/.gitmodules b/.gitmodules index 037accdbe424..14f7ce2ec08d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,13 @@ [submodule "parquet-testing"] path = parquet-testing url = https://github.com/apache/parquet-testing.git + update = none [submodule "testing"] path = testing url = https://github.com/apache/arrow-testing + update = none [submodule "datafusion-testing"] path = datafusion-testing url = https://github.com/apache/datafusion-testing.git branch = main + update = none