Skip to content

Commit 49a4757

Browse files
hsbteregon
authored andcommitted
Removed macos-arm-oss from GitHub Actions
1 parent 6f7e7eb commit 49a4757

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-12, macos-arm-oss ]
13+
os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-12, macos-14 ]
1414
ruby: [jruby-9.4.8.0]
1515
runs-on: ${{ matrix.os }}
1616
steps:
@@ -25,7 +25,7 @@ jobs:
2525
run: |
2626
platform=${{ matrix.os }}
2727
platform=${platform/macos-12/macos-latest}
28-
platform=${platform/macos-arm-oss/macos-13-arm64}
28+
platform=${platform/macos-14/macos-13-arm64}
2929
echo "platform=$platform" >> $GITHUB_OUTPUT
3030
- name: Set ruby
3131
id: ruby
@@ -95,7 +95,7 @@ jobs:
9595
# https://github.com/rbenv/ruby-build/discussions/1961#discussioncomment-4031745
9696
- name: Override RUBY_CONFIGURE_OPTS if macos-arm64 ruby-3.1
9797
run: echo 'RUBY_CONFIGURE_OPTS=--disable-shared --disable-install-doc' >> $GITHUB_ENV
98-
if: matrix.os == 'macos-arm-oss' && startsWith(steps.ruby.outputs.ruby, 'ruby-3.1')
98+
if: matrix.os == 'macos-14' && startsWith(steps.ruby.outputs.ruby, 'ruby-3.1')
9999

100100
- name: Build Ruby
101101
run: ruby-build --verbose $RUBY_BUILD_RUBY_NAME $PREFIX

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Archives are named `$engine-$version-$platform.tar.gz`.
3030

3131
`platform` is one of:
3232
* `ubuntu-NN.NN`: built on the corresponding GitHub-hosted runner virtual environment
33-
* `macos-latest`: built on `macos-12` (the oldest `macos` available on GitHub-hosted runners)
34-
* `macos-13-arm64`: built on `macos-arm-oss`
33+
* `macos-latest`: built on `macos-12`, the oldest `macos-amd64` available on GitHub-hosted runners.
34+
* `macos-13-arm64`: built on `macos-14`, the oldest `macos-arm64` available on GitHub-hosted runners.
3535
* `windows-latest`: built on `windows-2019` (does not matter, it's only for repacking a JRuby archive, no actual build)
3636

3737
The names contain `-latest` for compatibility, even though what `-latest` points to for runners might have changed.

0 commit comments

Comments
 (0)