Skip to content

Commit b746022

Browse files
committed
don't build with openssl < 3
1 parent 1947e14 commit b746022

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

dev/tasks/r/github.packages.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
platform:
6969
- { runs_on: macos-13, arch: "x86_64" }
7070
- { runs_on: macos-14, arch: "arm64" }
71-
openssl: ['3.0', '1.1']
71+
openssl: ['3.0']
7272

7373
steps:
7474
{{ macros.github_checkout_arrow(action_v="3")|indent }}
@@ -122,13 +122,7 @@ jobs:
122122
- openssl: "3.0"
123123
os: ubuntu
124124
ubuntu: "22.04"
125-
- extra-cmake-flags: >-
126-
-DCMAKE_INCLUDE_PATH=/usr/include/openssl11
127-
-DCMAKE_LIBRARY_PATH=/usr/lib64/openssl11
128-
openssl: "1.1"
129-
os: centos
130-
- openssl: "1.0"
131-
os: centos
125+
132126
steps:
133127
{{ macros.github_checkout_arrow()|indent }}
134128
{{ macros.github_change_r_pkg_version(is_fork, '${{ needs.source.outputs.pkg_version }}')|indent }}

dev/tasks/tasks.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -532,12 +532,8 @@ tasks:
532532
custom_version: Unset
533533
artifacts:
534534
- r-lib__libarrow__bin__windows__arrow-{no_rc_r_version}\.zip
535-
- r-lib__libarrow__bin__linux-openssl-1.0__arrow-{no_rc_r_version}\.zip
536-
- r-lib__libarrow__bin__linux-openssl-1.1__arrow-{no_rc_r_version}\.zip
537535
- r-lib__libarrow__bin__linux-openssl-3.0__arrow-{no_rc_r_version}\.zip
538-
- r-lib__libarrow__bin__darwin-arm64-openssl-1.1__arrow-{no_rc_r_version}\.zip
539536
- r-lib__libarrow__bin__darwin-arm64-openssl-3.0__arrow-{no_rc_r_version}\.zip
540-
- r-lib__libarrow__bin__darwin-x86_64-openssl-1.1__arrow-{no_rc_r_version}\.zip
541537
- r-lib__libarrow__bin__darwin-x86_64-openssl-3.0__arrow-{no_rc_r_version}\.zip
542538
- r-pkg__bin__windows__contrib__4.5__arrow_{no_rc_r_version}\.zip
543539
- r-pkg__bin__windows__contrib__4.4__arrow_{no_rc_r_version}\.zip

0 commit comments

Comments
 (0)