build: Update packaging settings

kordamp · Dec 24, 2024 · ab7922b · ab7922b
1 parent 4e08324
commit ab7922b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        os: [ ubuntu-latest, macos-13, windows-latest ]
     runs-on: ${{ matrix.os }}
     if: startsWith(github.event.head_commit.message, 'Releasing version') != true
 

diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        os: [ ubuntu-latest, macos-13, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        os: [ ubuntu-latest, macos-13, windows-latest ]
     runs-on: ${{ matrix.os }}
 
     steps:

diff --git a/apps/ikonli-browser/ikonli-browser.gradle b/apps/ikonli-browser/ikonli-browser.gradle
@@ -170,8 +170,8 @@ jlink {
         appVersion = rootProject.baseVersion
         outputDir = 'packagers'
         def imgType = rootProject.javafx_platform == 'win' ? 'ico' : rootProject.javafx_platform == 'mac' ? 'icns' : 'png'
-        imageOptions += ['--icon', "src/main/jpackage/icons/ikonli-browser.$imgType"]
-        installerOptions += ['--resource-dir', 'src/main/resources']
+        imageOptions += ['--icon', "apps/ikonli-browser/src/main/jpackage/icons/ikonli-browser.$imgType"]
+        installerOptions += ['--resource-dir', 'apps/ikonli-browser/src/main/resources']
         installerOptions += ['--vendor', 'Kordamp']
         if (rootProject.javafx_platform == 'win') {
             installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-shortcut']