Skip to content

Commit 6912dd5

Browse files
committed
Attempt at using macos-15-intel
1 parent e8a9e96 commit 6912dd5

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,16 @@ jobs:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
matrix:
10-
os: [ubuntu-latest, macos-13] # macos-14 doesn't support virtualization (uses ARM arch)
10+
os: [ubuntu-latest, macos-15-intel] # ARM runners don't support nested virtualization
1111
jdk-version: [21]
1212
steps:
1313
- name: Checkout repository
1414
uses: actions/checkout@v5
1515

16-
# We can't control the architecture of macOS runners, so we double-check here
17-
- name: Check architecture for nested virtualization on macOS
18-
if: runner.os == 'macos'
19-
shell: bash
20-
run: |
21-
if [ $(uname -m) != "x86_64" ]
22-
then
23-
echo "$(uname -m) detected. This test must be run on x86_64"
24-
exit -1
25-
fi
26-
exit 0
27-
2816
# Docker is not installed on GitHub's MacOS hosted workers due to licensing issues
2917
- name: Setup docker (missing on MacOS)
3018
if: runner.os == 'macos'
31-
# colima is not installed in macos-13, so we need this action since macos-12 is deprecated
19+
# colima is not installed in macos-15-intel, so we need this action now
3220
uses: douglascamata/setup-docker-macos-action@v1.0.1
3321

3422
# For testcontainers to find the Colima socket

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ run-name: "Release ${{ inputs.version }}-(cdp-version)"
1616

1717
jobs:
1818
release:
19-
runs-on: macos-13 # to force intel arch (macos-14+ use ARM which doesn't support virtualization)
19+
runs-on: macos-15-intel # ARM runners don't support nested virtualization
2020
steps:
2121
- name: Checkout repository
2222
uses: actions/checkout@v5
@@ -32,7 +32,7 @@ jobs:
3232
# Docker is not installed on GitHub's MacOS hosted workers due to licensing issues
3333
- name: Setup docker (missing on MacOS)
3434
if: runner.os == 'macos'
35-
# colima is not installed in macos-13, so we need this action since macos-12 is deprecated
35+
# colima is not installed in macos-15-intel, so we need this action now
3636
uses: douglascamata/setup-docker-macos-action@v1.0.1
3737

3838
# For testcontainers to find the Colima socket

0 commit comments

Comments
 (0)