ARROW-12824: [R][CI] Upgrade builds for R 4.1 release

Closes apache#10389 from thisisnic/ARROW-12824 Lead-authored-by: Nic Crane <[email protected]> Co-authored-by: Jonathan Keane <[email protected]> Co-authored-by: Nic <[email protected]> Signed-off-by: Jonathan Keane <[email protected]>
NetEase · Jun 7, 2021 · 9f5a491 · 9f5a491
1 parent 4fb9de2
commit 9f5a491
Show file tree

Hide file tree

Showing 14 changed files with 175 additions and 66 deletions.
diff --git a/.env b/.env
@@ -59,7 +59,7 @@ KARTOTHEK=latest
 HDFS=3.2.1
 SPARK=master
 DOTNET=3.1
-R=4.0
+R=4.1
 ARROW_R_DEV=TRUE
 # These correspond to images on Docker Hub that contain R, e.g. rhub/ubuntu-gcc-release:latest
 R_ORG=rhub

diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
@@ -57,8 +57,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        r: ["3.6"]
-        ubuntu: [18.04]
+        r: ["4.1"]
+        ubuntu: [20.04]
     env:
       R: ${{ matrix.r }}
       UBUNTU: ${{ matrix.ubuntu }}
@@ -173,7 +173,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rtools: [35, 40]
+        rtools: [40]
     env:
       TEST_R_WITH_ARROW: "TRUE"
       ARROW_R_CXXFLAGS: "-Werror"
@@ -209,18 +209,10 @@ jobs:
           path: ccache
           key: r-${{ matrix.rtools }}-ccache-mingw-${{ hashFiles('cpp/**') }}
           restore-keys: r-${{ matrix.rtools }}-ccache-mingw-
-      # We use the makepkg-mingw setup that is included in rtools40 even when
-      # we use the rtools35 compilers, so we always install R 4.0/Rtools40
       - uses: r-lib/actions/setup-r@master
         with:
           rtools-version: 40
-          r-version: "4.0"
-          Ncpus: 2
-      - uses: r-lib/actions/setup-r@master
-        if: ${{ matrix.rtools == 35 }}
-        with:
-          rtools-version: 35
-          r-version: "3.6"
+          r-version: "4.1"
           Ncpus: 2
       - name: Build Arrow C++
         shell: bash
@@ -255,8 +247,3 @@ jobs:
         shell: cmd
         run: cat check/arrow.Rcheck/00install.out
         if: always()
-      # We can remove this when we drop support for Rtools 3.5.
-      - name: Ensure using system tar in actions/cache
-        run: |
-          Write-Output "${Env:windir}\System32" | `
-            Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile
@@ -18,7 +18,7 @@
 ARG base
 FROM ${base}
 
-ARG r=4.0
+ARG r=4.1
 ARG jdk=8
 
 # See R install instructions at https://cloud.r-project.org/bin/linux/ubuntu/

diff --git a/ci/docker/linux-apt-r.dockerfile b/ci/docker/linux-apt-r.dockerfile
@@ -36,8 +36,8 @@ RUN apt-get update -y && \
     # -cran40 has 4.0 versions for bionic and focal
     # R 3.2, 3.3, 3.4 are available without the suffix but only for trusty and xenial
     # TODO: make sure OS version and R version are valid together and conditionally set repo suffix
-    # This is a hack to turn 3.6 into 35 and 4.0 into 40:
-    add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu '$(lsb_release -cs)'-cran'$(echo "${r}" | tr -d . | tr 6 5)'/' && \
+    # This is a hack to turn 3.6 into 35, and 4.0/4.1 into 40:
+    add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu '$(lsb_release -cs)'-cran'$(echo "${r}" | tr -d . | tr 6 5 | tr 1 0)'/' && \
     apt-get install -y \
         r-base=${r}* \
         r-recommended=${r}* \

diff --git a/...recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml b/...recipes/.ci_support/linux_64_cuda_compiler_versionNonenumpy1.17python3.7.____cpython.yaml
@@ -1,5 +1,5 @@
 aws_sdk_cpp:
-- 1.8.151
+- 1.8.186
 bzip2:
 - '1'
 c_compiler:
@@ -25,17 +25,17 @@ docker_image:
 gflags:
 - '2.2'
 glog:
-- 0.4.0
+- '0.5'
 grpc_cpp:
-- '1.36'
+- '1.38'
 libprotobuf:
-- '3.15'
+- '3.16'
 lz4_c:
 - 1.9.3
 numpy:
 - '1.17'
 orc:
-- 1.6.7
+- 1.6.8
 pin_run_as_build:
   bzip2:
     max_pin: x
@@ -67,4 +67,4 @@ zip_keys:
 zlib:
 - '1.2'
 zstd:
-- '1.4'
+- '1.5'
diff --git a/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.6.____cpython.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 aws_sdk_cpp:
-- 1.8.151
+- 1.8.186
 bzip2:
 - '1'
 c_compiler:
@@ -21,19 +21,19 @@ cxx_compiler_version:
 gflags:
 - '2.2'
 glog:
-- 0.4.0
+- '0.5'
 grpc_cpp:
-- '1.36'
+- '1.38'
 libprotobuf:
-- '3.15'
+- '3.16'
 lz4_c:
 - 1.9.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:
 - '1.17'
 orc:
-- 1.6.7
+- 1.6.8
 pin_run_as_build:
   bzip2:
     max_pin: x
@@ -62,4 +62,4 @@ zip_keys:
 zlib:
 - '1.2'
 zstd:
-- '1.4'
+- '1.5'
diff --git a/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml b/dev/tasks/conda-recipes/.ci_support/osx_64_numpy1.17python3.7.____cpython.yaml
@@ -1,7 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 aws_sdk_cpp:
-- 1.8.151
+- 1.8.186
 bzip2:
 - '1'
 c_compiler:
@@ -21,19 +21,19 @@ cxx_compiler_version:
 gflags:
 - '2.2'
 glog:
-- 0.4.0
+- '0.5'
 grpc_cpp:
-- '1.36'
+- '1.38'
 libprotobuf:
-- '3.15'
+- '3.16'
 lz4_c:
 - 1.9.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:
 - '1.17'
 orc:
-- 1.6.7
+- 1.6.8
 pin_run_as_build:
   bzip2:
     max_pin: x
@@ -62,4 +62,4 @@ zip_keys:
 zlib:
 - '1.2'
 zstd:
-- '1.4'
+- '1.5'
diff --git a/...pes/.ci_support/r/linux_64_r_base3.6.yaml → ...pes/.ci_support/r/linux_64_r_base4.1.yaml b/...pes/.ci_support/r/linux_64_r_base3.6.yaml → ...pes/.ci_support/r/linux_64_r_base4.1.yaml
@@ -1,22 +1,29 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '7'
+- '9'
+cdt_name:
+- cos6
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '7'
+- '9'
 docker_image:
-- condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-comp7
 pin_run_as_build:
   r-base:
     min_pin: x.x
     max_pin: x.x
 r_base:
-- '3.6'
+- '4.1'
 target_platform:
 - linux-64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
+- - cdt_name
+  - docker_image
diff --git a/dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.0.yaml b/dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.0.yaml
@@ -3,19 +3,17 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '10'
+- '11'
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '10'
+- '11'
 macos_machine:
 - x86_64-apple-darwin13.4.0
-macos_min_version:
-- '10.9'
 pin_run_as_build:
   r-base:
     min_pin: x.x
@@ -24,3 +22,6 @@ r_base:
 - '4.0'
 target_platform:
 - osx-64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
diff --git a/...cipes/.ci_support/r/osx_64_r_base3.6.yaml → ...cipes/.ci_support/r/osx_64_r_base4.1.yaml b/...cipes/.ci_support/r/osx_64_r_base3.6.yaml → ...cipes/.ci_support/r/osx_64_r_base4.1.yaml
@@ -3,24 +3,25 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '10'
+- '11'
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '10'
+- '11'
 macos_machine:
 - x86_64-apple-darwin13.4.0
-macos_min_version:
-- '10.9'
 pin_run_as_build:
   r-base:
     min_pin: x.x
     max_pin: x.x
 r_base:
-- '3.6'
+- '4.1'
 target_platform:
 - osx-64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
diff --git a/...cipes/.ci_support/r/win_64_r_base3.6.yaml → ...cipes/.ci_support/r/win_64_r_base4.1.yaml b/...cipes/.ci_support/r/win_64_r_base3.6.yaml → ...cipes/.ci_support/r/win_64_r_base4.1.yaml
@@ -7,6 +7,6 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 r_base:
-- '3.6'
+- '4.1'
 target_platform:
 - win-64
diff --git a/dev/tasks/r/github.linux.versions.yml b/dev/tasks/r/github.linux.versions.yml
@@ -39,6 +39,7 @@ jobs:
           - "3.3"
           - "3.4"
           - "3.5"
+          - "3.6"
     env:
       R_ORG: "rstudio"
       R_IMAGE: "r-base"
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,7 @@ jobs: @@
               - "3.3"
               - "3.4"
               - "3.5"
+              - "3.6"
         env:
           R_ORG: "rstudio"
           R_IMAGE: "r-base"
@@ Expand Down @@