Skip to content

Commit 75f812a

Browse files
committed
GH-47821: [CI][Release][R] Add backslash to repo folder for R binary testing and remove libarrow subfolder
1 parent 3df46b9 commit 75f812a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

dev/tasks/macros.jinja

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,15 @@ env:
244244
uses: actions/download-artifact@v4
245245
with:
246246
name: r-libarrow-windows-x86_64
247-
path: repo/libarrow
247+
path: repo
248248
{% endif %}
249249
{% if get_nix %}
250250
{% for openssl_version in ["1.0", "1.1", "3.0"] %}
251251
- name: Get Linux OpenSSL {{ openssl_version }} binary
252252
uses: actions/download-artifact@v4
253253
with:
254254
name: r-libarrow-linux-x86_64-openssl-{{ openssl_version }}
255-
path: repo/libarrow
255+
path: repo
256256
{% endfor %}
257257
{% endif %}
258258
{% if get_mac %}
@@ -262,7 +262,7 @@ env:
262262
uses: actions/download-artifact@v4
263263
with:
264264
name: r-libarrow-darwin-{{ arch }}-openssl-{{ openssl_version }}
265-
path: repo/libarrow
265+
path: repo
266266
{% endfor %}
267267
{% endfor %}
268268
{% endif %}
@@ -285,7 +285,7 @@ env:
285285
shell: Rscript {0}
286286
run: |
287287
profile_path <- file.path(getwd(), ".Rprofile")
288-
repo <- paste0("file://", getwd(), "/repo")
288+
repo <- paste0("file://", getwd(), "/repo/")
289289
str <- paste0("options(arrow.repo = '", repo, "' )")
290290
print(str)
291291
write(str, file = profile_path, append = TRUE)

dev/tasks/r/github.packages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ jobs:
257257
LIBARROW_BINARY: "true" # has to be set as long as allowlist not updated
258258
LIBARROW_BUILD: "false"
259259
ARROW_R_ENFORCE_CHECKSUM: "true"
260-
ARROW_R_CHECKSUM_PATH: "{{ '${{ github.workspace }}' }}/repo/libarrow"
260+
ARROW_R_CHECKSUM_PATH: "{{ '${{ github.workspace }}' }}/repo"
261261
run: |
262262
on_windows <- tolower(Sys.info()[["sysname"]]) == "windows"
263263
@@ -346,7 +346,7 @@ jobs:
346346
LIBARROW_BUILD: "FALSE"
347347
LIBARROW_BINARY: {{ '${{ matrix.config.libarrow_binary }}' }}
348348
ARROW_R_ENFORCE_CHECKSUM: "true"
349-
ARROW_R_CHECKSUM_PATH: "{{ '${{ github.workspace }}' }}/repo/libarrow"
349+
ARROW_R_CHECKSUM_PATH: "{{ '${{ github.workspace }}' }}/repo"
350350
shell: bash
351351
run: |
352352
Rscript -e '

0 commit comments

Comments
 (0)