diff --git a/.github/workflows/multiOSReleases.yml b/.github/workflows/multiOSReleases.yml index 02f064d60..fd24bd178 100644 --- a/.github/workflows/multiOSReleases.yml +++ b/.github/workflows/multiOSReleases.yml @@ -4,6 +4,8 @@ on: workflow_dispatch: release: types: [created] + push: + branches: [ "mac-x86_64-installer-fix" ] permissions: contents: read @@ -170,6 +172,23 @@ jobs: STIRLING_PDF_DESKTOP_UI: true BROWSER_OPEN: true + - name: ☕ Set up JDK (x86_64) + if: matrix.os == 'macos-latest' + run: | + curl -L -o jdk.tar.gz https://cdn.azul.com/zulu/bin/zulu17.56.15-ca-jdk17.0.14-macosx_x64.tar.gz + mkdir -p zulu17 + tar -xzf jdk.tar.gz -C zulu17 --strip-components=1 + echo "JAVA_HOME=$PWD/zulu17" >> $GITHUB_ENV + echo "$PWD/zulu17/bin" >> $GITHUB_PATH + + - name: Verify JDK architecture + if: matrix.os == 'macos-latest' + run: file $JAVA_HOME/bin/java + + - name: Build project and run jpackage (x86_64) + if: matrix.os == 'macos-latest' + run: arch -x86_64 ./gradlew clean build jpackageMacX64 + # Rename and collect artifacts based on OS - name: Prepare artifacts id: prepare diff --git a/build.gradle b/build.gradle index db9ef8504..6523b2c28 100644 --- a/build.gradle +++ b/build.gradle @@ -281,7 +281,7 @@ tasks.register('jpackageMacX64') { } } -jpackage.finalizedBy(jpackageMacX64) +//jpackage.finalizedBy(jpackageMacX64) tasks.register('downloadTempJre') { group = 'distribution'