Skip to content

Commit 9ece12a

Browse files
authored
Migrate to macOS 15 x86_64 for release build (#21)
* Migrate to macOS 15 x86_64 for release build Because macOS 13 image is deprecated, see https://redirect.github.com/actions/runner-images/issues/13046 Also adjusts the build setup a bit to make it easier to understand. * Rename matrix variable
1 parent 37d698a commit 9ece12a

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

.github/workflows/build-all-and-publish.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,13 @@ jobs:
9595
fail-fast: false
9696
matrix:
9797
include:
98-
- os: macos-13
98+
- os: macos-15-intel
9999
arch: x86_64
100-
java7: true
100+
fullbuild: true
101101
- os: macos-14
102102
arch: aarch64
103-
java7: false
103+
# Build only the native binary for this architecture; it suffices if only one of the macOS builds performs a full Maven build
104+
fullbuild: false
104105

105106
steps:
106107
- name: Checkout
@@ -111,7 +112,7 @@ jobs:
111112

112113
- name: Setup Zulu JDK 7
113114
uses: actions/setup-java@v5
114-
if: ${{ matrix.java7 }}
115+
if: ${{ matrix.fullbuild }}
115116
with:
116117
distribution: zulu
117118
java-version: '7'
@@ -122,16 +123,16 @@ jobs:
122123
java-version: '21'
123124
cache: maven
124125

125-
- name: Build (process-resources only on macos-14)
126-
if: ${{ matrix.os == 'macos-14' }}
126+
- name: Build (native binary build only)
127+
if: ${{ !matrix.fullbuild }}
127128
run: |
128129
./mvnw -B -V -DskipTests \
129130
-Darch.id=${{ matrix.arch }} \
130131
-Dnative.cc=cc \
131132
process-resources
132133
133-
- name: Build (mvn verify on macos-13)
134-
if: ${{ matrix.os != 'macos-14' }}
134+
- name: Build (full build)
135+
if: ${{ matrix.fullbuild }}
135136
run: |
136137
./mvnw -B -V \
137138
-Darch.id=${{ matrix.arch }} \

0 commit comments

Comments
 (0)