Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update openssl to 1.1.1j and ruby to 2.7.2 to enable m1 mac builds #153

Merged
merged 5 commits into from
Mar 3, 2021
Merged

Update openssl to 1.1.1j and ruby to 2.7.2 to enable m1 mac builds #153

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e65f07
Update openssl to 1.1.1j to accomodate builds on M1 mac
marcparadise Feb 19, 2021
b021dd5
Remove macos 10.13 from build matrices
jeremiahsnapp Feb 26, 2021
db1d0e8
Add macOS M1 to build matrices
jeremiahsnapp Feb 26, 2021
a6b93b8
Bump ruby to 2.7.2 for M1 mac builds
jeremiahsnapp Feb 26, 2021
294cf08
Add entitlements.plist
jeremiahsnapp Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions .expeditor/angry-release-canary.omnibus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ builder-to-testers-map:
freebsd-11-amd64:
- freebsd-11-amd64
- freebsd-12-amd64
# mac_os_x-10.13-x86_64:
# - mac_os_x-10.13-x86_64
# - mac_os_x-10.14-x86_64
# - mac_os_x-10.15-x86_64
mac_os_x-10.14-x86_64:
- mac_os_x-10.14-x86_64
- mac_os_x-10.15-x86_64
- mac_os_x-11-x86_64
mac_os_x-11-arm64:
- mac_os_x-11-arm64
# sles-12-s390x:
# - sles-12-s390x
sles-12-x86_64:
Expand Down
7 changes: 4 additions & 3 deletions .expeditor/angry-release.omnibus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ builder-to-testers-map:
freebsd-11-amd64:
- freebsd-11-amd64
- freebsd-12-amd64
mac_os_x-10.13-x86_64:
- mac_os_x-10.13-x86_64
mac_os_x-10.14-x86_64:
- mac_os_x-10.14-x86_64
- mac_os_x-10.15-x86_64
- mac_os_x-11.0-x86_64
- mac_os_x-11-x86_64
mac_os_x-11-arm64:
- mac_os_x-11-arm64
sles-12-s390x:
- sles-12-s390x
- sles-15-s390x
Expand Down
11 changes: 6 additions & 5 deletions .expeditor/release-canary.omnibus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ builder-to-testers-map:
freebsd-11-amd64:
- freebsd-11-amd64
- freebsd-12-amd64
# mac_os_x-10.13-x86_64:
# - mac_os_x-10.13-x86_64
# - mac_os_x-10.14-x86_64
# - mac_os_x-10.15-x86_64
# - mac_os_x-11.0-x86_64
mac_os_x-10.14-x86_64:
- mac_os_x-10.14-x86_64
- mac_os_x-10.15-x86_64
- mac_os_x-11-x86_64
mac_os_x-11-arm64:
- mac_os_x-11-arm64
# sles-12-s390x:
# - sles-12-s390x
sles-12-x86_64:
Expand Down
7 changes: 4 additions & 3 deletions .expeditor/release.omnibus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ builder-to-testers-map:
freebsd-11-amd64:
- freebsd-11-amd64
- freebsd-12-amd64
mac_os_x-10.13-x86_64:
- mac_os_x-10.13-x86_64
mac_os_x-10.14-x86_64:
- mac_os_x-10.14-x86_64
- mac_os_x-10.15-x86_64
- mac_os_x-11.0-x86_64
- mac_os_x-11-x86_64
mac_os_x-11-arm64:
- mac_os_x-11-arm64
sles-12-s390x:
- sles-12-s390x
- sles-15-s390x
Expand Down
5 changes: 4 additions & 1 deletion config/projects/omnibus-toolchain.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,13 @@
install_dir "#{default_root}/#{name}"
end

override :ruby, version: "2.6.5"
override :ruby, version: "2.7.2"
override :bundler, version: "1.17.2"
override :gtar, version: "1.32"

# 1.1.1i+ builds on m1 mac
override :openssl, version: "1.1.1j"

# Solaris fails compile on libtool version 2.4.2 and 2.4.6
if solaris?
override :libtool, version: "2.4"
Expand Down