Skip to content

Commit 2177864

Browse files
authored
1 parent 1adbd84 commit 2177864

2 files changed

Lines changed: 80 additions & 72 deletions

File tree

.github/workflows/extended.yml

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,16 @@ jobs:
7171
fetch-depth: 1
7272
- name: Free Disk Space (Ubuntu)
7373
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
74-
- name: Install Rust
75-
run: |
76-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
77-
source $HOME/.cargo/env
78-
rustup toolchain install
79-
- name: Install Protobuf Compiler
80-
run: |
81-
sudo apt-get update
82-
sudo apt-get install -y protobuf-compiler
74+
- parallel:
75+
- name: Install Rust
76+
run: |
77+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
78+
source $HOME/.cargo/env
79+
rustup toolchain install
80+
- name: Install Protobuf Compiler
81+
run: |
82+
sudo apt-get update
83+
sudo apt-get install -y protobuf-compiler
8384
# For debugging, test binaries can be large.
8485
- name: Show available disk space
8586
run: |
@@ -98,10 +99,11 @@ jobs:
9899
--tests \
99100
--bins \
100101
--features avro,json,backtrace,extended_tests,recursive_protection,parquet_encryption
101-
- name: Verify Working Directory Clean
102-
run: git diff --exit-code
103-
- name: Cleanup
104-
run: cargo clean
102+
- parallel:
103+
- name: Verify Working Directory Clean
104+
run: git diff --exit-code
105+
- name: Cleanup
106+
run: cargo clean
105107

106108
# Check answers are correct when hash values collide
107109
hash-collisions:
@@ -133,15 +135,16 @@ jobs:
133135
image: amd64/rust
134136
steps:
135137
- uses: runs-on/action@4e5f72399b6b17f2e79c511c1b38a315a64d22dc # v2.2.0
136-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
137-
with:
138-
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
139-
submodules: true
140-
fetch-depth: 1
141-
# Don't use setup-builder to avoid configuring RUST_BACKTRACE which is expensive
142-
- name: Install protobuf compiler
143-
run: |
144-
apt-get update && apt-get install -y protobuf-compiler
138+
- parallel:
139+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
140+
with:
141+
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
142+
submodules: true
143+
fetch-depth: 1
144+
# Don't use setup-builder to avoid configuring RUST_BACKTRACE which is expensive
145+
- name: Install protobuf compiler
146+
run: |
147+
apt-get update && apt-get install -y protobuf-compiler
145148
- name: Run sqllogictest
146149
run: |
147-
cargo test --features backtrace,parquet_encryption --profile ci-optimized --test sqllogictests -- --include-sqlite
150+
cargo test --features backtrace,parquet_encryption --profile ci-optimized --test sqllogictests -- --include-sqlite

.github/workflows/rust.yml

Lines changed: 54 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -325,17 +325,18 @@ jobs:
325325
--tests \
326326
--bins \
327327
--features serde,avro,json,backtrace,integration-tests,parquet_encryption,substrait
328-
- name: Verify Working Directory Clean
329-
run: git diff --exit-code
330-
# Check no temporary directories created during test.
331-
# `false/` folder is excuded for rust cache.
332-
- name: Verify Working Directory Clean (No Untracked Files)
333-
run: |
334-
STATUS="$(git status --porcelain | sed -e '/^?? false\/$/d' -e '/^?? false$/d')"
335-
if [ -n "$STATUS" ]; then
336-
echo "$STATUS"
337-
exit 1
338-
fi
328+
- parallel:
329+
- name: Verify Working Directory Clean
330+
run: git diff --exit-code
331+
# Check no temporary directories created during test.
332+
# `false/` folder is excuded for rust cache.
333+
- name: Verify Working Directory Clean (No Untracked Files)
334+
run: |
335+
STATUS="$(git status --porcelain | sed -e '/^?? false\/$/d' -e '/^?? false$/d')"
336+
if [ -n "$STATUS" ]; then
337+
echo "$STATUS"
338+
exit 1
339+
fi
339340
340341
# datafusion-cli tests
341342
linux-test-datafusion-cli:
@@ -442,17 +443,18 @@ jobs:
442443
runs-on: ubuntu-24.04
443444
steps:
444445
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
445-
- name: Setup for wasm32
446-
run: |
447-
rustup target add wasm32-unknown-unknown
448-
- name: Install dependencies
449-
run: |
450-
sudo apt-get update -qq
451-
sudo apt-get install -y -qq clang
452-
- name: Setup wasm-pack
453-
uses: taiki-e/install-action@43aecc8d72668fbcfe75c31400bc4f890f1c5853 # v2.83.2
454-
with:
455-
tool: wasm-pack
446+
- parallel:
447+
- name: Setup for wasm32
448+
run: |
449+
rustup target add wasm32-unknown-unknown
450+
- name: Install dependencies
451+
run: |
452+
sudo apt-get update -qq
453+
sudo apt-get install -y -qq clang
454+
- name: Setup wasm-pack
455+
uses: taiki-e/install-action@43aecc8d72668fbcfe75c31400bc4f890f1c5853 # v2.83.2
456+
with:
457+
tool: wasm-pack
456458
- name: Run tests with headless mode
457459
working-directory: ./datafusion/wasmtest
458460
run: |
@@ -474,18 +476,19 @@ jobs:
474476
with:
475477
submodules: true
476478
fetch-depth: 1
477-
- name: Setup Rust toolchain
478-
uses: ./.github/actions/setup-builder
479-
with:
480-
rust-version: stable
481-
- name: Generate benchmark data and expected query results
482-
run: |
483-
mkdir -p datafusion/sqllogictest/test_files/tpch/data
484-
git clone https://github.com/databricks/tpch-dbgen.git
485-
cd tpch-dbgen
486-
make
487-
./dbgen -f -s 0.1
488-
mv *.tbl ../datafusion/sqllogictest/test_files/tpch/data
479+
- parallel:
480+
- name: Setup Rust toolchain
481+
uses: ./.github/actions/setup-builder
482+
with:
483+
rust-version: stable
484+
- name: Generate benchmark data and expected query results
485+
run: |
486+
mkdir -p datafusion/sqllogictest/test_files/tpch/data
487+
git clone https://github.com/databricks/tpch-dbgen.git
488+
cd tpch-dbgen
489+
make
490+
./dbgen -f -s 0.1
491+
mv *.tbl ../datafusion/sqllogictest/test_files/tpch/data
489492
- name: Verify that benchmark queries return expected results
490493
run: |
491494
# increase stack size to fix stack overflow
@@ -697,13 +700,14 @@ jobs:
697700
uses: ./.github/actions/setup-builder
698701
with:
699702
rust-version: stable
700-
- name: Install Clippy
701-
run: rustup component add clippy
702-
- name: Rust Dependency Cache
703-
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
704-
with:
705-
save-if: ${{ github.ref_name == 'main' }}
706-
shared-key: "amd-ci-clippy"
703+
- parallel:
704+
- name: Install Clippy
705+
run: rustup component add clippy
706+
- name: Rust Dependency Cache
707+
uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
708+
with:
709+
save-if: ${{ github.ref_name == 'main' }}
710+
shared-key: "amd-ci-clippy"
707711
- name: Run clippy
708712
run: ci/scripts/rust_clippy.sh
709713

@@ -776,15 +780,16 @@ jobs:
776780
submodules: true
777781
fetch-depth: 1
778782

779-
- name: Mark repository as safe for git
780-
# Required for git commands inside container (avoids "dubious ownership" error)
781-
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
783+
- parallel:
784+
- name: Mark repository as safe for git
785+
# Required for git commands inside container (avoids "dubious ownership" error)
786+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
782787

783-
- name: Set up Node.js (required for prettier)
784-
# doc_prettier_check.sh uses npx to run prettier for Markdown formatting
785-
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
786-
with:
787-
node-version: '18'
788+
- name: Set up Node.js (required for prettier)
789+
# doc_prettier_check.sh uses npx to run prettier for Markdown formatting
790+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
791+
with:
792+
node-version: '18'
788793

789794
- name: Run examples docs check script
790795
run: |

0 commit comments

Comments
 (0)