From fc2ee2013be919200a0920531d41bc08b8d39d15 Mon Sep 17 00:00:00 2001 From: Jefffrey Date: Sun, 21 Jan 2024 18:56:15 +1100 Subject: [PATCH 1/6] Remove disable incremental flag for win ci --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 375c9f2c2c5a..b48dab7c3e2b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -285,6 +285,8 @@ jobs: cargo test --lib --tests --bins --features avro,json,backtrace cd datafusion-cli cargo test --lib --tests --bins --all-features + env: + RUSTFLAGS: "-C debuginfo=line-tables-only" macos: name: cargo test (macos) From 2e3a7204a5ddee414b1da3aeabed2fe36948ad55 Mon Sep 17 00:00:00 2001 From: Jefffrey Date: Sun, 21 Jan 2024 19:46:24 +1100 Subject: [PATCH 2/6] Trigger From fa1ebf620fe10aab842b631a74482cc3eb28716f Mon Sep 17 00:00:00 2001 From: Jefffrey Date: Sun, 21 Jan 2024 21:02:50 +1100 Subject: [PATCH 3/6] Trigger From f449e8fe13a7cfd00013545a2327b8926dc4303c Mon Sep 17 00:00:00 2001 From: Jefffrey Date: Sun, 21 Jan 2024 21:23:42 +1100 Subject: [PATCH 4/6] Fix RUSTFLAGS name --- .github/actions/setup-rust-runtime/action.yaml | 2 +- .github/workflows/rust.yml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/actions/setup-rust-runtime/action.yaml b/.github/actions/setup-rust-runtime/action.yaml index 90e09a957cd4..27cdf9b97419 100644 --- a/.github/actions/setup-rust-runtime/action.yaml +++ b/.github/actions/setup-rust-runtime/action.yaml @@ -37,5 +37,5 @@ runs: echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV echo "RUST_BACKTRACE=1" >> $GITHUB_ENV echo "RUST_MIN_STACK=3000000" >> $GITHUB_ENV - echo "RUST_FLAGS=-C debuginfo=line-tables-only -C incremental=false" >> $GITHUB_ENV + echo "RUSTFLAGS=-C debuginfo=line-tables-only -C incremental=false" >> $GITHUB_ENV diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b48dab7c3e2b..375c9f2c2c5a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -285,8 +285,6 @@ jobs: cargo test --lib --tests --bins --features avro,json,backtrace cd datafusion-cli cargo test --lib --tests --bins --all-features - env: - RUSTFLAGS: "-C debuginfo=line-tables-only" macos: name: cargo test (macos) From 1063cdb63255d3c806b34bd5804180799116347c Mon Sep 17 00:00:00 2001 From: Jefffrey Date: Sun, 21 Jan 2024 22:15:01 +1100 Subject: [PATCH 5/6] Remove RUST_MIN_STACK --- .github/actions/setup-rust-runtime/action.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/setup-rust-runtime/action.yaml b/.github/actions/setup-rust-runtime/action.yaml index 27cdf9b97419..23529a4b77eb 100644 --- a/.github/actions/setup-rust-runtime/action.yaml +++ b/.github/actions/setup-rust-runtime/action.yaml @@ -36,6 +36,5 @@ runs: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV echo "RUST_BACKTRACE=1" >> $GITHUB_ENV - echo "RUST_MIN_STACK=3000000" >> $GITHUB_ENV echo "RUSTFLAGS=-C debuginfo=line-tables-only -C incremental=false" >> $GITHUB_ENV From b38911a2ab56f3aae13a036d31de5df2c03ad4d6 Mon Sep 17 00:00:00 2001 From: Jefffrey Date: Mon, 22 Jan 2024 21:05:50 +1100 Subject: [PATCH 6/6] Re-add RUST_MIN_STACK --- .github/actions/setup-rust-runtime/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup-rust-runtime/action.yaml b/.github/actions/setup-rust-runtime/action.yaml index 23529a4b77eb..27cdf9b97419 100644 --- a/.github/actions/setup-rust-runtime/action.yaml +++ b/.github/actions/setup-rust-runtime/action.yaml @@ -36,5 +36,6 @@ runs: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV echo "RUST_BACKTRACE=1" >> $GITHUB_ENV + echo "RUST_MIN_STACK=3000000" >> $GITHUB_ENV echo "RUSTFLAGS=-C debuginfo=line-tables-only -C incremental=false" >> $GITHUB_ENV