From edc36f59e22fe3d52f89a991ed5c82fbccef8410 Mon Sep 17 00:00:00 2001
From: eitsupi <ts1s1andn@gmail.com>
Date: Sat, 25 May 2024 08:14:52 +0000
Subject: [PATCH] ci: try to fix ubuntu amd64

---
 .github/workflows/release-lib.yml | 35 +++++++++++++------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release-lib.yml b/.github/workflows/release-lib.yml
index 2b009aa..d8262c8 100644
--- a/.github/workflows/release-lib.yml
+++ b/.github/workflows/release-lib.yml
@@ -54,14 +54,6 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Set up R
-        # macos latest runner does't have R
-        if: runner.os == 'macOS'
-        uses: r-lib/actions/setup-r@v2
-        with:
-          use-public-rspm: true
-          Ncpus: 2
-
       - uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -91,6 +83,17 @@ jobs:
           echo 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc' >>"$GITHUB_ENV"
           echo 'CC=aarch64-linux-gnu-gcc' >>"$GITHUB_ENV"
 
+      - name: Set up R
+        uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+          Ncpus: 2
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          packages: any::pkgbuild, any::nanoarrow
+          dependencies: 'FALSE'
+
       - name: build lib
         env:
           NOT_CRAN: "true"
@@ -103,18 +106,10 @@ jobs:
 
           LIB_PATH="$(pwd)/rust/target/${TARGET}/release/${LIB_NAME}.a"
           ARTIFACT_NAME="${LIB_NAME}-${LIB_VERSION}-${TARGET}.tar.gz"
-          if [[ "${{ runner.os }}" == "macOS" ]]; then
-            # Rinternals header is needed
-            pushd ..
-            Rscript -e 'install.packages(c("pkgbuild", "nanoarrow"))'
-            Rscript -e 'pkgbuild::compile_dll(debug = FALSE)'
-            popd
-          else
-            pushd ..
-            bash ./configure${{ runner.os == 'Windows' && '.win' || '' }}
-            popd
-            make -f Makevars${{ runner.os == 'Windows' && '.win' || '' }} "${LIB_PATH}"
-          fi
+          # Rinternals header is needed
+          pushd ..
+          Rscript -e 'pkgbuild::compile_dll(debug = FALSE)'
+          popd
 
           tar -czf "../${ARTIFACT_NAME}" -C "rust/target/${TARGET}/release" "${LIB_NAME}.a"
           echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >>"$GITHUB_ENV"