From f80c3e0aed20f75723d6a2df32d1e612f85e2aa5 Mon Sep 17 00:00:00 2001
From: Raphael Taylor-Davies <r.taylordavies@googlemail.com>
Date: Mon, 15 Aug 2022 17:55:16 +0100
Subject: [PATCH 1/2] Simplify archery integration and disable JS temporarily
 (#2448)

---
 .github/workflows/integration.yml | 66 ++++++++++++++++++++++++++-----
 1 file changed, 57 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 81969466ebf4..10a8e30212a9 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -34,7 +34,30 @@ jobs:
   integration:
     name: Archery test With other arrows
     runs-on: ubuntu-latest
+    container:
+      image: apache/arrow-dev:amd64-conda-integration
+    env:
+      ARROW_USE_CCACHE: OFF
+      ARROW_CPP_EXE_PATH: /build/cpp/debug
+      BUILD_DOCS_CPP: OFF
+      # These are necessary because the github runner overrides $HOME
+      # https://github.com/actions/runner/issues/863
+      RUSTUP_HOME: /root/.rustup
+      CARGO_HOME: /root/.cargo
+    defaults:
+      run:
+        shell: bash
     steps:
+      # This is necessary so that actions/checkout can find git
+      - name: Export conda path
+        run: echo "/opt/conda/envs/arrow/bin" >> $GITHUB_PATH
+      # This is necessary so that Rust can find cargo
+      - name: Export cargo path
+        run: echo "/root/.cargo/bin" >> $GITHUB_PATH
+      - name: Check rustup
+        run: which rustup
+      - name: Check cmake
+        run: which cmake
       - name: Checkout Arrow
         uses: actions/checkout@v3
         with:
@@ -46,14 +69,39 @@ jobs:
         with:
           path: rust
           fetch-depth: 0
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.8
-      - name: Setup Archery
-        run: pip install -e dev/archery[docker]
-      - name: Execute Docker Build
-        run: archery docker run -e ARCHERY_INTEGRATION_WITH_RUST=1 conda-integration
+      - name: Make build directory
+        run: mkdir /build
+      - name: Build Rust
+        run: conda run --no-capture-output ci/scripts/rust_build.sh $PWD /build
+      - name: Build C++
+        run: conda run --no-capture-output ci/scripts/cpp_build.sh $PWD /build
+      - name: Build C#
+        run: conda run --no-capture-output ci/scripts/csharp_build.sh $PWD /build
+      - name: Build Go
+        run: conda run --no-capture-output ci/scripts/go_build.sh $PWD
+      - name: Build Java
+        run: conda run --no-capture-output ci/scripts/java_build.sh $PWD /build
+      # Temporarily disable JS https://issues.apache.org/jira/browse/ARROW-17410
+      # - name: Build JS
+      #   run: conda run --no-capture-output ci/scripts/js_build.sh $PWD /build
+      - name: Install archery
+        run: conda run --no-capture-output pip install -e dev/archery
+      - name: Run integration tests
+        run: |
+          conda run --no-capture-output archery integration \
+            --run-flight \
+            --with-cpp=1 \
+            --with-csharp=1 \
+            --with-java=1 \
+            --with-js=0 \
+            --with-go=1 \
+            --with-rust=1 \
+            --gold-dirs=testing/data/arrow-ipc-stream/integration/0.14.1 \
+            --gold-dirs=testing/data/arrow-ipc-stream/integration/0.17.1 \
+            --gold-dirs=testing/data/arrow-ipc-stream/integration/1.0.0-bigendian \
+            --gold-dirs=testing/data/arrow-ipc-stream/integration/1.0.0-littleendian \
+            --gold-dirs=testing/data/arrow-ipc-stream/integration/2.0.0-compression \
+            --gold-dirs=testing/data/arrow-ipc-stream/integration/4.0.0-shareddict
 
   # test FFI against the C-Data interface exposed by pyarrow
   pyarrow-integration-test:
@@ -61,7 +109,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rust: [stable]
+        rust: [ stable ]
     steps:
       - uses: actions/checkout@v3
         with:

From 0a80450a2ed2f38f0d49b6c3b134fe78ca4ad86b Mon Sep 17 00:00:00 2001
From: Raphael Taylor-Davies <r.taylordavies@googlemail.com>
Date: Mon, 15 Aug 2022 18:05:05 +0100
Subject: [PATCH 2/2] Re-enable JS

---
 .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 10a8e30212a9..d78f02c95a48 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -81,9 +81,8 @@ jobs:
         run: conda run --no-capture-output ci/scripts/go_build.sh $PWD
       - name: Build Java
         run: conda run --no-capture-output ci/scripts/java_build.sh $PWD /build
-      # Temporarily disable JS https://issues.apache.org/jira/browse/ARROW-17410
-      # - name: Build JS
-      #   run: conda run --no-capture-output ci/scripts/js_build.sh $PWD /build
+      - name: Build JS
+        run: conda run --no-capture-output ci/scripts/js_build.sh $PWD /build
       - name: Install archery
         run: conda run --no-capture-output pip install -e dev/archery
       - name: Run integration tests
@@ -93,7 +92,7 @@ jobs:
             --with-cpp=1 \
             --with-csharp=1 \
             --with-java=1 \
-            --with-js=0 \
+            --with-js=1 \
             --with-go=1 \
             --with-rust=1 \
             --gold-dirs=testing/data/arrow-ipc-stream/integration/0.14.1 \