From 6f8b3a7273c840ea01dd5d1c1abc391178f04357 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 16 Sep 2024 06:30:32 +0900 Subject: [PATCH 1/2] GH-44127: [CI][R] Fix util_enable_core_dumps.sh path --- dev/tasks/r/github.packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml index 66008275148f9..11d1f85a4cb52 100644 --- a/dev/tasks/r/github.packages.yml +++ b/dev/tasks/r/github.packages.yml @@ -140,7 +140,7 @@ jobs: UBUNTU: {{ '"${{ matrix.ubuntu }}"' }} {{ macros.github_set_sccache_envvars()|indent(8) }} run: | - source ci/scripts/util_enable_core_dumps.sh + source arrow/ci/scripts/util_enable_core_dumps.sh archery docker run \ -e EXTRA_CMAKE_FLAGS="{{ '${{ matrix.extra-cmake-flags }}' }}" \ {{ '${{ matrix.os }}' }}-cpp-static From 6ec3cedee86c9fa7fcb1ac10f8e76d07b8a51261 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 16 Sep 2024 23:15:14 +0900 Subject: [PATCH 2/2] Use {download,upload}-artifact v4 --- dev/tasks/macros.jinja | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/tasks/macros.jinja b/dev/tasks/macros.jinja index 082d33b124f9f..f814b4b476e16 100644 --- a/dev/tasks/macros.jinja +++ b/dev/tasks/macros.jinja @@ -320,7 +320,7 @@ env: run: mkdir repo {% if get_win %} - name: Get windows binary - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: r-lib__libarrow__bin__windows path: repo/libarrow/bin/windows @@ -328,7 +328,7 @@ env: {% if get_nix %} {% for openssl_version in ["1.0", "1.1", "3.0"] %} - name: Get Linux OpenSSL {{ openssl_version }} binary - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: r-lib__libarrow__bin__linux-openssl-{{ openssl_version }} path: repo/libarrow/bin/linux-openssl-{{ openssl_version }} @@ -338,7 +338,7 @@ env: {% for openssl_version in ["1.1", "3.0"] %} {% for arch in ["x86_64", "arm64"] %} - name: Get macOS {{ arch }} OpenSSL {{ openssl_version }} binary - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: r-lib__libarrow__bin__darwin-{{arch}}-openssl-{{ openssl_version }} path: repo/libarrow/bin/darwin-{{ arch }}-openssl-{{ openssl_version }} @@ -346,7 +346,7 @@ env: {% endfor %} {% endif %} - name: Get src pkg - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: r-pkg__src__contrib path: repo/src/contrib