Skip to content

Commit

Permalink
chore: change macos runners 12/13/14 --> 13/14/15
Browse files Browse the repository at this point in the history
  • Loading branch information
maxirmx committed Nov 26, 2024
1 parent 72c3ee2 commit d0959bd
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
18 changes: 12 additions & 6 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ jobs:
fail-fast: false
matrix:
env:
- { os: macos-12, xcode: 13.1 }
- { os: macos-13, xcode: 14.3.1 }
- { os: macos-14, xcode: 15.0.1, LG_VADDR: 39 }
- { os: macos-14, xcode: 15.4 }
- { os: macos-15, xcode: 16.1 }
ruby_ver: ['3.2.5']
steps:
- name: Checkout tebako packaging environment
Expand Down Expand Up @@ -108,8 +109,11 @@ jobs:
fail-fast: false
matrix:
env:
- { os: macos-12, xcode: 13.1 }
- { os: macos-13, xcode: 14.3.1 }
- { os: macos-14, xcode: 15.0.1, LG_VADDR: 39}
- { os: macos-14, xcode: 15.4 }
- { os: macos-15, xcode: 16.1 }

package_ruby_ver: [ '3.1.6', '3.2.5', '3.3.5' ]
ruby_ver: ['3.2.5']
include:
Expand Down Expand Up @@ -141,7 +145,7 @@ jobs:
- name: Shall upload artifacts?
id: shall-upload
run: |
if [ "${{ matrix.package_ruby_ver }}" == "3.2.5" ] && [ "${{ matrix.ruby_ver }}" == "3.2.5" ] && [ "${{ matrix.env.os }}" == "macos-12" ]; then
if [ "${{ matrix.package_ruby_ver }}" == "3.2.5" ] && [ "${{ matrix.ruby_ver }}" == "3.2.5" ] && [ "${{ matrix.env.os }}" == "macos-13" ]; then
echo "upload=true" >> $GITHUB_OUTPUT
else
echo "upload=false" >> $GITHUB_OUTPUT
Expand All @@ -161,8 +165,10 @@ jobs:
fail-fast: false
matrix:
env:
- { os: macos-12, xcode: 13.1 }
- { os: macos-13, xcode: 14.3.1 }
- { os: macos-14, xcode: 15.0.1, LG_VADDR: 39}
- { os: macos-14, xcode: 15.4 }
- { os: macos-15, xcode: 16.1 }
package_ruby_ver: [ '3.1.6', '3.2.5', '3.3.5' ]
ruby_ver: ['3.2.5']
include:
Expand Down Expand Up @@ -198,9 +204,9 @@ jobs:
needs: tests-1
strategy:
fail-fast: false
# Running on MacOS-14 is a test for x86_64 package on arm64 system
# Running on MacOS-14, 15 is a test for x86_64 package on arm64 system
matrix:
os: [ macos-13, macos-14 ]
os: [ macos-14, macos-15 ]
runs-on: ${{ matrix.os }}
steps:
- name: Download test packages
Expand Down
8 changes: 4 additions & 4 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ architectures.
| Alpine 3.17 | amd64 | gcc/g+\+: default; clang/clang++: default

3+| **macOS**
| macOS 12 (Monterey) | amd64 | xcode: [13.1, 14.3.1]
| macOS 13 (Ventura) | amd64, aarch64 | xcode: [13.1, 14.3.1]
| macOS 14 (Sonoma) | amd64, aarch64 | xcode: [13.1, 14.3.1, 15.4]
| macOS 13 (Ventura) | amd64, arm64 | tested agains xcode: [14.3.1]
| macOS 14 (Sonoma) | amd64, arm64 | tested agains xcode: [15.0.1, 15.4]
| macOS 15 (Sequoia) | amd64, arm64 | tested agains xcode: [16.1]

3+| **Windows**
| Windows 10 | amd64 | MinGW ucrt64
Expand Down Expand Up @@ -578,7 +578,7 @@ brew install gnu-sed bash pkg-config bison flex binutils libffi gdbm zlib \
brew bundle
----

Additionaly tebako repository includes `Brewfile` that can be used with
Additionaly tebako repository includes `Brewfile` that can be used with
`brew bundle` command.

[source,sh]
Expand Down

0 comments on commit d0959bd

Please sign in to comment.