Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/create_desktop_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ jobs:
strategy:
matrix:
include:
- os: macos-15 # runner Intel (x64)
- os: macos-15-intel # runner Intel (x64)
arch: x64
jdk_url: "https://corretto.aws/downloads/latest/amazon-corretto-17-x64-macos-jdk.pkg"
- os: macos-latest

steps:
Expand Down Expand Up @@ -55,12 +54,12 @@ jobs:
path: FloconDesktop/composeApp/build/compose/binaries/main/dmg/*.dmg

- name: Rename macOS x64 dmg
if: matrix.os == 'macos-15'
if: matrix.os == 'macos-15-intel'
run: |
mv FloconDesktop/composeApp/build/compose/binaries/main/dmg/*.dmg FloconDesktop/composeApp/build/compose/binaries/main/dmg/macos-x64.dmg

- name: Upload macOS x64 artifact
if: matrix.os == 'macos-15'
if: matrix.os == 'macos-15-intel'
uses: actions/upload-artifact@v4
with:
name: macos-x64-dmg
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
include:
- os: macos-15 # runner Intel (x64)
- os: macos-15-intel # runner Intel (x64)
arch: x64
jdk_url: "https://corretto.aws/downloads/latest/amazon-corretto-17-x64-macos-jdk.pkg"
- os: macos-latest
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
path: FloconDesktop/composeApp/build/compose/binaries/main/deb/*.deb

- name: Rename macOS x64 dmg
if: matrix.os == 'macos-15'
if: matrix.os == 'macos-15-intel'
run: |
mv FloconDesktop/composeApp/build/compose/binaries/main/dmg/*.dmg FloconDesktop/composeApp/build/compose/binaries/main/dmg/macos-x64.dmg

Expand All @@ -70,7 +70,7 @@ jobs:
path: FloconDesktop/composeApp/build/compose/binaries/main/dmg/*.dmg

- name: Upload macOS x64 artifact
if: matrix.os == 'macos-15'
if: matrix.os == 'macos-15-intel'
uses: actions/upload-artifact@v4
with:
name: macos-x64-dmg
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
path: FloconDesktop/composeApp/build/compose/jars/*.jar

- name: Upload macOS x64 Release Jar
if: matrix.os == 'macos-15'
if: matrix.os == 'macos-15-intel'
uses: actions/upload-artifact@v4
with:
name: macos-x64-jar
Expand Down