Skip to content

Commit e06b5e7

Browse files
authored
Switch to new macos intel runner and update arm runner as well (#14048)
* Switch to new macos intel runner and update arm runner as well Refs https://github.blog/changelog/2025-09-19-github-actions-macos-13-runner-image-is-closing-down/ * macos15 * fix target names * fix target names
1 parent 0a63038 commit e06b5e7

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/binaries.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,16 @@ jobs:
154154
archivePortableJabKit: 7z a -r jabkit/build/packages/windows-latest/jabkit-portable_windows.zip ./jabkit/build/packages/windows-latest/jabkit && rm -R jabkit/build/packages/windows-latest/jabkit
155155
suffix: ''
156156
archForDebianRepack: ''
157-
- os: macos-13 # intel image
157+
- os: macos-15-intel # intel image
158158
displayName: macOS
159-
archivePortable: 7z a -r jabgui/build/packages/macos-13/JabRef-portable_macos.zip ./jabgui/build/packages/macos-13/JabRef.app && rm -R jabgui/build/packages/macos-13/JabRef.app
160-
archivePortableJabKit: 7z a -r jabkit/build/packages/macos-13/jabkit-portable_macos.zip ./jabkit/build/packages/macos-13/jabkit.app && rm -R jabkit/build/packages/macos-13/jabkit.app
159+
archivePortable: 7z a -r jabgui/build/packages/macos-15-intel/JabRef-portable_macos.zip ./jabgui/build/packages/macos-15-intel/JabRef.app && rm -R jabgui/build/packages/macos-15-intel/JabRef.app
160+
archivePortableJabKit: 7z a -r jabkit/build/packages/macos-15-intel/jabkit-portable_macos.zip ./jabkit/build/packages/macos-15-intel/jabkit.app && rm -R jabkit/build/packages/macos-15-intel/jabkit.app
161161
suffix: ''
162162
archForDebianRepack: ''
163-
- os: macos-14
163+
- os: macos-15
164164
displayName: macOS-arm
165-
archivePortable: 7z a -r jabgui/build/packages/macos-14/JabRef-portable_macos-arm.zip ./jabgui/build/packages/macos-14/JabRef.app && rm -R jabgui/build/packages/macos-14/JabRef.app
166-
archivePortableJabKit: 7z a -r jabkit/build/packages/macos-14/jabkit-portable_macos-arm.zip ./jabkit/build/packages/macos-14/jabkit.app && rm -R jabkit/build/packages/macos-14/jabkit.app
165+
archivePortable: 7z a -r jabgui/build/packages/macos-15/JabRef-portable_macos-arm.zip ./jabgui/build/packages/macos-15/JabRef.app && rm -R jabgui/build/packages/macos-15/JabRef.app
166+
archivePortableJabKit: 7z a -r jabkit/build/packages/macos-15/jabkit-portable_macos-arm.zip ./jabkit/build/packages/macos-15/jabkit.app && rm -R jabkit/build/packages/macos-15/jabkit.app
167167
suffix: '_arm64'
168168
archForDebianRepack: ''
169169
runs-on: ${{ matrix.os }}
@@ -396,10 +396,10 @@ jobs:
396396
max-parallel: 1
397397
matrix:
398398
include:
399-
- os: macos-14
399+
- os: macos-15
400400
displayName: macOS (ARM64)
401401
suffix: '_arm64'
402-
- os: macos-13 # intel image
402+
- os: macos-15-intel # intel image
403403
displayName: macOS
404404
suffix: ''
405405
runs-on: ${{ matrix.os }}

build-logic/src/main/kotlin/org.jabref.gradle.base.targets.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ javaModulePackaging {
2525
architecture = MachineArchitecture.ARM64
2626
packageTypes = listOf("app-image", "deb", "rpm")
2727
}
28-
target("macos-13") {
28+
target("macos-15-intel") {
2929
operatingSystem = OperatingSystemFamily.MACOS
3030
architecture = MachineArchitecture.X86_64
3131
packageTypes = listOf("app-image", "dmg", "pkg")
3232
singleStepPackaging = true
3333
}
34-
target("macos-14") {
34+
target("macos-15") {
3535
operatingSystem = OperatingSystemFamily.MACOS
3636
architecture = MachineArchitecture.ARM64
3737
packageTypes = listOf("app-image", "dmg", "pkg")

0 commit comments

Comments
 (0)