transition to rhub lto option

apache · Aug 2, 2021 · e278e8a · e278e8a
1 parent c250042
commit e278e8a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 44 deletions.
diff --git a/dev/tasks/docker-tests/azure.linux.yml b/dev/tasks/docker-tests/azure.linux.yml
@@ -45,15 +45,6 @@ jobs:
       git -C arrow submodule update --init --recursive
     displayName: Clone arrow
 
-  # only needed for r-lto job to use until https://github.com/wch/r-debug/pull/22 is merged
-  - script: |
-      git clone https://github.com/nealrichardson/r-debug.git
-      git checkout lto
-      cd r-debug
-      ./buildall.sh
-    condition: contains(variables['LTO'], 'true')
-    displayName: build r-debug
-
   - script: pip install -e arrow/dev/archery[docker]
     displayName: Setup Archery
 

diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
@@ -981,16 +981,6 @@ tasks:
         UBUNTU: 18.04
       run: ubuntu-r-valgrind
 
-  test-r-lto:
-    ci: azure
-    template: docker-tests/azure.linux.yml
-    params:
-      env:
-        ARROW_R_DEV: "TRUE"
-        UBUNTU: 18.04
-        LTO: true
-      run: ubuntu-r-lto
-
   test-r-linux-rchk:
     ci: github
     template: r/github.linux.rchk.yml
@@ -1024,7 +1014,8 @@ tasks:
                                  ("rstudio", "r-base", "3.6-bionic"),
                                  ("rstudio", "r-base", "3.6-centos8"),
                                  ("rstudio", "r-base", "3.6-opensuse15"),
-                                 ("rstudio", "r-base", "3.6-opensuse42")] %}
+                                 ("rstudio", "r-base", "3.6-opensuse42"),
+                                 ("rhub", "debian-gcc-devel-lto", "latest")] %}
   test-r-{{ r_org }}-{{ r_image }}-{{ r_tag }}:
     ci: azure
     template: r/azure.linux.yml

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -134,7 +134,6 @@ x-hierarchy:
   - ubuntu-cpp-thread-sanitizer
   - ubuntu-r-sanitizer
   - ubuntu-r-valgrind
-  - ubuntu-r-lto
   - python-sdist
   - r
   - r-revdepcheck
@@ -1147,29 +1146,6 @@ services:
       /bin/bash -c "
         /arrow/ci/scripts/r_valgrind.sh /arrow"
 
-  ubuntu-r-lto:
-    # Only 18.04 and amd64 supported
-    # Usage:
-    #   docker-compose build ubuntu-r-lto
-    #   docker-compose run ubuntu-r-lto
-    image: ${REPO}:amd64-ubuntu-18.04-r-lto
-    build:
-      context: .
-      dockerfile: ci/docker/linux-r.dockerfile
-      cache_from:
-        - ${REPO}:amd64-ubuntu-18.04-r-lto
-      args:
-        base: wch1/r-debug
-        r_bin: RDlto
-        tz: ${TZ}
-    environment:
-      <<: *ccache
-      ARROW_R_DEV: ${ARROW_R_DEV}
-    volumes: *ubuntu-volumes
-    command: >
-      /bin/bash -c "
-        /arrow/ci/scripts/r_test.sh /arrow"
-
   r-revdepcheck:
     # Usage:
     #   docker-compose build r-revdepcheck