From 08b6d9d558b2efdb66382bd30435315a31182dac Mon Sep 17 00:00:00 2001 From: Raphael Taylor-Davies <r.taylordavies@googlemail.com> Date: Mon, 13 May 2024 10:37:41 +0100 Subject: [PATCH 1/2] Downgrade to Rust 1.77 in integration pipeline (#5719) --- .github/workflows/integration.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 1ce2c1301440..1bb6f02197bf 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -95,11 +95,10 @@ jobs: with: path: rust fetch-depth: 0 - # Workaround https://github.com/rust-lang/jobserver-rs/issues/87 - # Can be removed once https://github.com/rust-lang/jobserver-rs/pull/88 is released - - name: Downgrade jobserver + # Workaround https://github.com/rust-lang/rust/issues/125067 + - name: Downgrade rust working-directory: rust - run: cargo update -p cc --precise 1.0.94 && cargo update -p jobserver --precise 0.1.28 + run: rustup override set 1.77 - name: Build run: conda run --no-capture-output ci/scripts/integration_arrow_build.sh $PWD /build - name: Run From c97477f753f6b4e416f02e5a1cf9588a57b6373b Mon Sep 17 00:00:00 2001 From: Raphael Taylor-Davies <r.taylordavies@googlemail.com> Date: Mon, 13 May 2024 10:49:34 +0100 Subject: [PATCH 2/2] Checkout nanoarrow --- .github/workflows/integration.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 1bb6f02197bf..579c79eaee10 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -95,6 +95,12 @@ jobs: with: path: rust fetch-depth: 0 + - name: Checkout Arrow nanoarrow + uses: actions/checkout@v4 + with: + repository: apache/arrow-nanoarrow + path: nanoarrow + fetch-depth: 0 # Workaround https://github.com/rust-lang/rust/issues/125067 - name: Downgrade rust working-directory: rust