From ab7922b0469e72b0888be691844ae79417571030 Mon Sep 17 00:00:00 2001 From: Andres Almiray Date: Tue, 24 Dec 2024 14:16:28 +0100 Subject: [PATCH] build: Update packaging settings --- .github/workflows/build.yml | 2 +- .github/workflows/early-access.yml | 2 +- .github/workflows/release.yml | 2 +- apps/ikonli-browser/ikonli-browser.gradle | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3999e617..1a2a0e2e 100644 --- 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 index 2da801e0..e919da0d 100644 --- 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 index 616bb12b..dda167a9 100644 --- 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 index a229e3da..6f0f2aed 100644 --- 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']