Skip to content

Commit 3b4d7e3

Browse files
committed
Some minor clean-up to set PR to ready for review
1 parent 0aa5710 commit 3b4d7e3

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

.github/workflows/r_extra.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
uses: ./.github/workflows/check_labels.yml
7676
secrets: inherit
7777
with:
78-
parent-workflow: cpp_extra
78+
parent-workflow: r_extra
7979

8080
docker:
8181
needs: check-labels
@@ -102,16 +102,16 @@ jobs:
102102
image: r
103103
runs-on: ubuntu-latest
104104
run-options: >-
105-
-e LIBARROW_MINIMAL=TRUE
106-
title: Rocker R-ver - Minimal
105+
-e ARROW_DEPENDENCY_SOURCE=BUNDLED
106+
title: Rocker R-ver - Bundled Dependencies
107107
- envs:
108108
- R_IMAGE=r-ver
109109
- R_ORG=rocker
110110
image: r
111111
runs-on: ubuntu-latest
112112
run-options: >-
113-
-e ARROW_DEPENDENCY_SOURCE=BUNDLED
114-
title: Rocker R-ver - Bundled Dependencies
113+
-e LIBARROW_MINIMAL=TRUE
114+
title: Rocker R-ver - Minimal
115115
- envs:
116116
- R_IMAGE=r-ver
117117
- R_ORG=rocker
@@ -127,9 +127,9 @@ jobs:
127127
runs-on: ubuntu-latest
128128
title: Rhub
129129
- envs:
130+
- R_CUSTOM_CCACHE=true
130131
- R_IMAGE=ubuntu-gcc12
131132
- R_ORG=rhub
132-
- R_CUSTOM_CCACHE=true
133133
image: r
134134
runs-on: ubuntu-latest
135135
title: Rhub GCC 12
@@ -184,8 +184,6 @@ jobs:
184184
ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
185185
ENVS: ${{ toJSON(matrix.envs) }}
186186
run: |
187-
# GH-40558: reduce ASLR to avoid ASAN/LSAN crashes
188-
sudo sysctl -w vm.mmap_rnd_bits=28
189187
source ci/scripts/util_enable_core_dumps.sh
190188
if [ "${ENVS}" != "null" ]; then
191189
echo "${ENVS}" | jq -r '.[]' | while read env; do

0 commit comments

Comments
 (0)