This commit is contained in:
Craig Raw 2024-02-15 11:39:46 +02:00
parent ee195f2677
commit 865c52e5d9
2 changed files with 6 additions and 6 deletions

View file

@ -12,14 +12,14 @@ jobs:
matrix: matrix:
os: [windows-2022, ubuntu-20.04, macos-12] os: [windows-2022, ubuntu-20.04, macos-12]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
submodules: true submodules: true
- name: Set up JDK 21.0.2 - name: Set up JDK 21.0.2
uses: actions/setup-java@v3 uses: actions/setup-java@v4
with: with:
distribution: 'temurin' distribution: 'temurin'
java-version: '21.0.2' java-version: '21.0.1'
- name: Show Build Versions - name: Show Build Versions
run: ./gradlew -v run: ./gradlew -v
- name: Build with Gradle - name: Build with Gradle
@ -31,7 +31,7 @@ jobs:
if: ${{ runner.os == 'Linux' }} if: ${{ runner.os == 'Linux' }}
run: ./gradlew packageTarDistribution run: ./gradlew packageTarDistribution
- name: Upload Artifacts - name: Upload Artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: Sparrow Build - ${{ runner.os }} name: Sparrow Build - ${{ runner.os }}
path: | path: |
@ -48,7 +48,7 @@ jobs:
run: for f in build/jpackage/sparrow*; do mv -v "$f" "${f/sparrow/sparrow-server}"; done; run: for f in build/jpackage/sparrow*; do mv -v "$f" "${f/sparrow/sparrow-server}"; done;
- name: Upload Headless Artifact - name: Upload Headless Artifact
if: ${{ runner.os == 'Linux' }} if: ${{ runner.os == 'Linux' }}
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: Sparrow Build - ${{ runner.os }} Headless name: Sparrow Build - ${{ runner.os }} Headless
path: | path: |

View file

@ -214,7 +214,7 @@ jlink {
uses 'org.eclipse.jetty.websocket.common.RemoteEndpointFactory' uses 'org.eclipse.jetty.websocket.common.RemoteEndpointFactory'
} }
options = ['--strip-native-commands', '--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages', '--ignore-signing-information', '--exclude-files', '**.png', '--exclude-resources', 'glob:/com.sparrowwallet.merged.module/META-INF/*'] options = ['--strip-native-commands', '--strip-java-debug-attributes', '--compress', 'zip-6', '--no-header-files', '--no-man-pages', '--ignore-signing-information', '--exclude-files', '**.png', '--exclude-resources', 'glob:/com.sparrowwallet.merged.module/META-INF/*']
launcher { launcher {
name = 'sparrow' name = 'sparrow'
jvmArgs = ["--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls", jvmArgs = ["--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls",