From 18792f1c391dc1b16840ab8ddc93dc2393c22d0d Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Sat, 9 Dec 2023 02:31:36 +0100 Subject: [PATCH] Revert "run devtools::build in r-binary-packages" This reverts commit b9c839cdca2e8516a530dbb8d7e8c40ac2be34c1. --- dev/tasks/r/github.packages.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml index 7b656544f3826..2ddfd02e73134 100644 --- a/dev/tasks/r/github.packages.yml +++ b/dev/tasks/r/github.packages.yml @@ -41,27 +41,20 @@ jobs: - uses: r-lib/actions/setup-r@v2 with: install-r: false - use-public-rspm: true - - - name: Install dependencies - uses: r-lib/actions/setup-r-dependencies@v2 - with: - working-directory: 'arrow' - extra-packages: styler - name: Build R source package shell: bash - env: - ARROW_FORCE_BOOTSTRAP: "true" run: | cd arrow/r - R -s -e 'devtools::build()' + # Copy in the Arrow C++ source + make sync-cpp + R CMD build --no-build-vignettes . - name: Upload package artifact uses: actions/upload-artifact@v3 with: name: r-pkg__src__contrib - path: arrow/arrow_*.tar.gz + path: arrow/r/arrow_*.tar.gz macos-cpp: name: C++ Binary macOS OpenSSL {{ '${{ matrix.openssl }}' }} {{ '${{ matrix.platform.arch }}' }} @@ -160,7 +153,7 @@ jobs: PKG_FILE: arrow-{{ '${{ needs.source.outputs.pkg_version }}' }}.zip VERSION: {{ '${{ needs.source.outputs.pkg_version }}' }} run: | - # These files were created by the docker user so we have to chown them + # These files were created by the docker user so we have to chown them sudo chown -R $USER:$USER arrow/r/libarrow cd arrow/r/libarrow/dist