Skip to content

Commit 0f166c1

Browse files
committed
Update macOS x86 runners and fix GoCaves download error on macOS
1 parent 7f22907 commit 0f166c1

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ jobs:
363363
364364
build_macos_x86_64:
365365
needs: source
366-
runs-on: macos-13
366+
runs-on: macos-15-intel
367367
strategy:
368368
fail-fast: false
369369
matrix:
@@ -402,7 +402,7 @@ jobs:
402402
needs:
403403
- source
404404
- build_macos_x86_64
405-
runs-on: macos-13
405+
runs-on: macos-15-intel
406406
steps:
407407
- uses: actions/download-artifact@v4
408408
with:
@@ -565,7 +565,7 @@ jobs:
565565
needs:
566566
- source
567567
- repackage_macos_x86_64
568-
runs-on: macos-13
568+
runs-on: macos-15-intel
569569
strategy:
570570
fail-fast: false
571571
matrix:

Gemfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,16 @@ group :development do
4444
gem "ruby-lsp", require: false
4545
gem "simplecov-cobertura"
4646
gem "yard"
47+
48+
# Resolves https://github.com/ruby/openssl/issues/949 which we encounter when downloading gocaves on Arm macOS on CI
49+
# This has been fixed in openssl versions 3.1.2, 3.2.2, 3.3.1.
50+
# Only Ruby 3.3.10 comes with a new enough openssl version by default. We can remove this once Ruby 3.4.8 and 3.2.10
51+
# are released.
52+
if RUBY_PLATFORM.include?("darwin")
53+
if RUBY_VERSION.start_with?('3.4')
54+
gem "openssl", ">= 3.3.1"
55+
elsif RUBY_VERSION.start_with?('3.2', '3.1')
56+
gem "openssl", ">= 3.1.2"
57+
end
58+
end
4759
end

0 commit comments

Comments
 (0)