Skip to content

Commit 8ef347b

Browse files
h-vetinarih-vetinari
committed
sync ci support for r-arrow, reinstate R 4.1 builds
1 parent 03e6af5 commit 8ef347b

9 files changed

Lines changed: 160 additions & 8 deletions

‎dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.1.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
c_compiler:
2+
- gcc
3+
c_compiler_version:
4+
- '12'
5+
cdt_name:
6+
- cos6
7+
channel_sources:
8+
- conda-forge
9+
channel_targets:
10+
- conda-forge main
11+
cxx_compiler:
12+
- gxx
13+
cxx_compiler_version:
14+
- '12'
15+
docker_image:
16+
- quay.io/condaforge/linux-anvil-cos7-x86_64
17+
pin_run_as_build:
18+
r-base:
19+
min_pin: x.x
20+
max_pin: x.x
21+
r_base:
22+
- '4.1'
23+
target_platform:
24+
- linux-64
25+
zip_keys:
26+
- - c_compiler_version
27+
- cxx_compiler_version

‎dev/tasks/conda-recipes/.ci_support/r/linux_64_r_base4.2.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
c_compiler:
22
- gcc
33
c_compiler_version:
4-
- '11'
4+
- '12'
55
cdt_name:
66
- cos6
77
channel_sources:
@@ -11,7 +11,7 @@ channel_targets:
1111
cxx_compiler:
1212
- gxx
1313
cxx_compiler_version:
14-
- '11'
14+
- '12'
1515
docker_image:
1616
- quay.io/condaforge/linux-anvil-cos7-x86_64
1717
pin_run_as_build:

‎dev/tasks/conda-recipes/.ci_support/r/linux_aarch64_r_base4.1.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
BUILD:
2+
- aarch64-conda_cos7-linux-gnu
3+
c_compiler:
4+
- gcc
5+
c_compiler_version:
6+
- '12'
7+
cdt_arch:
8+
- aarch64
9+
cdt_name:
10+
- cos7
11+
channel_sources:
12+
- conda-forge
13+
channel_targets:
14+
- conda-forge main
15+
cxx_compiler:
16+
- gxx
17+
cxx_compiler_version:
18+
- '12'
19+
docker_image:
20+
- quay.io/condaforge/linux-anvil-cos7-x86_64
21+
pin_run_as_build:
22+
r-base:
23+
min_pin: x.x
24+
max_pin: x.x
25+
r_base:
26+
- '4.1'
27+
target_platform:
28+
- linux-aarch64
29+
zip_keys:
30+
- - c_compiler_version
31+
- cxx_compiler_version

‎dev/tasks/conda-recipes/.ci_support/r/linux_aarch64_r_base4.2.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BUILD:
33
c_compiler:
44
- gcc
55
c_compiler_version:
6-
- '11'
6+
- '12'
77
cdt_arch:
88
- aarch64
99
cdt_name:
@@ -15,7 +15,7 @@ channel_targets:
1515
cxx_compiler:
1616
- gxx
1717
cxx_compiler_version:
18-
- '11'
18+
- '12'
1919
docker_image:
2020
- quay.io/condaforge/linux-anvil-cos7-x86_64
2121
pin_run_as_build:

‎dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.1.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
MACOSX_DEPLOYMENT_TARGET:
2+
- '10.9'
3+
c_compiler:
4+
- clang
5+
c_compiler_version:
6+
- '15'
7+
channel_sources:
8+
- conda-forge
9+
channel_targets:
10+
- conda-forge main
11+
cxx_compiler:
12+
- clangxx
13+
cxx_compiler_version:
14+
- '15'
15+
macos_machine:
16+
- x86_64-apple-darwin13.4.0
17+
pin_run_as_build:
18+
r-base:
19+
min_pin: x.x
20+
max_pin: x.x
21+
r_base:
22+
- '4.1'
23+
target_platform:
24+
- osx-64
25+
zip_keys:
26+
- - c_compiler_version
27+
- cxx_compiler_version

‎dev/tasks/conda-recipes/.ci_support/r/osx_64_r_base4.2.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
33
c_compiler:
44
- clang
55
c_compiler_version:
6-
- '14'
6+
- '15'
77
channel_sources:
88
- conda-forge
99
channel_targets:
1010
- conda-forge main
1111
cxx_compiler:
1212
- clangxx
1313
cxx_compiler_version:
14-
- '14'
14+
- '15'
1515
macos_machine:
1616
- x86_64-apple-darwin13.4.0
1717
pin_run_as_build:

‎dev/tasks/conda-recipes/.ci_support/r/osx_arm64_r_base4.1.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
MACOSX_DEPLOYMENT_TARGET:
2+
- '11.0'
3+
c_compiler:
4+
- clang
5+
c_compiler_version:
6+
- '15'
7+
channel_sources:
8+
- conda-forge
9+
channel_targets:
10+
- conda-forge main
11+
cxx_compiler:
12+
- clangxx
13+
cxx_compiler_version:
14+
- '15'
15+
macos_machine:
16+
- arm64-apple-darwin20.0.0
17+
pin_run_as_build:
18+
r-base:
19+
min_pin: x.x
20+
max_pin: x.x
21+
r_base:
22+
- '4.1'
23+
target_platform:
24+
- osx-arm64
25+
zip_keys:
26+
- - c_compiler_version
27+
- cxx_compiler_version

‎dev/tasks/conda-recipes/.ci_support/r/osx_arm64_r_base4.2.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
33
c_compiler:
44
- clang
55
c_compiler_version:
6-
- '14'
6+
- '15'
77
channel_sources:
88
- conda-forge
99
channel_targets:
1010
- conda-forge main
1111
cxx_compiler:
1212
- clangxx
1313
cxx_compiler_version:
14-
- '14'
14+
- '15'
1515
macos_machine:
1616
- arm64-apple-darwin20.0.0
1717
pin_run_as_build:

‎dev/tasks/tasks.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,16 @@ tasks:
246246
# generated and to be synced regularly from the feedstock. We have no way
247247
# yet to generate them inside the arrow repository automatically.
248248

249+
conda-linux-x64-cpu-r41:
250+
ci: azure
251+
template: conda-recipes/azure.linux.yml
252+
params:
253+
config: linux_64_cuda_compiler_versionNone
254+
r_config: linux_64_r_base4.1
255+
artifacts:
256+
- libarrow-{no_rc_version}-(h[a-z0-9]+)_0_cpu.conda
257+
- r-arrow-{no_rc_version}-r41(h[a-z0-9]+)_0.conda
258+
249259
conda-linux-x64-cpu-r42:
250260
ci: azure
251261
template: conda-recipes/azure.linux.yml
@@ -282,6 +292,16 @@ tasks:
282292

283293
########################### Conda Linux (aarch64) ###########################
284294

295+
conda-linux-aarch64-cpu-r41:
296+
ci: azure
297+
template: conda-recipes/azure.linux.yml
298+
params:
299+
config: linux_aarch64_cuda_compiler_versionNone
300+
r_config: linux_aarch64_r_base4.1
301+
artifacts:
302+
- libarrow-{no_rc_version}-(h[a-z0-9]+)_0_cpu.conda
303+
- r-arrow-{no_rc_version}-r41(h[a-z0-9]+)_0.conda
304+
285305
conda-linux-aarch64-cpu-r42:
286306
ci: azure
287307
template: conda-recipes/azure.linux.yml
@@ -344,6 +364,16 @@ tasks:
344364

345365
############################## Conda OSX (x64) ##############################
346366

367+
conda-osx-x64-cpu-r41:
368+
ci: azure
369+
template: conda-recipes/azure.osx.yml
370+
params:
371+
config: osx_64_
372+
r_config: osx_64_r_base4.1
373+
artifacts:
374+
- libarrow-{no_rc_version}-(h[a-z0-9]+)_0_cpu.conda
375+
- r-arrow-{no_rc_version}-r41(h[a-z0-9]+)_0.conda
376+
347377
conda-osx-x64-cpu-r42:
348378
ci: azure
349379
template: conda-recipes/azure.osx.yml
@@ -368,6 +398,16 @@ tasks:
368398

369399
############################# Conda OSX (arm64) #############################
370400

401+
conda-osx-arm64-cpu-r41:
402+
ci: azure
403+
template: conda-recipes/azure.osx.yml
404+
params:
405+
config: osx_arm64_
406+
r_config: osx_arm64_r_base4.1
407+
artifacts:
408+
- libarrow-{no_rc_version}-(h[a-z0-9]+)_0_cpu.conda
409+
- r-arrow-{no_rc_version}-r41(h[a-z0-9]+)_0.conda
410+
371411
conda-osx-arm64-cpu-r42:
372412
ci: azure
373413
template: conda-recipes/azure.osx.yml

0 commit comments

Comments
 (0)