sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-02 20:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

followup

Browse source
This commit is contained in:
Craig Raw 2022-10-25 10:23:17 +02:00
parent dbc1e7746b
commit c572011578
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/package.yaml vendored
View file

@ -45,7 +45,10 @@ jobs:
run: ./gradlew -Djava.awt.headless=true clean jpackage run: ./gradlew -Djava.awt.headless=true clean jpackage
- name: Package headless tar distribution - name: Package headless tar distribution
if: ${{ runner.os == 'Linux' }} if: ${{ runner.os == 'Linux' }}
run: ./gradlew packageTarDistribution run: ./gradlew -Djava.awt.headless=true packageTarDistribution
- name: Rename Headless Artifacts
if: ${{ runner.os == 'Linux' }}
run: rename 's/sparrow/sparrow-server/g' build/jpackage/*
- name: Upload Headless Artifact - name: Upload Headless Artifact
if: ${{ runner.os == 'Linux' }} if: ${{ runner.os == 'Linux' }}
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2

10
build.gradle
View file

@ -20,10 +20,6 @@ if(System.getProperty("os.arch") == "aarch64") {
targetName = "-" + osArch targetName = "-" + osArch
} }
def headless = "true".equals(System.getProperty("java.awt.headless")) || GraphicsEnvironment.isHeadless() def headless = "true".equals(System.getProperty("java.awt.headless")) || GraphicsEnvironment.isHeadless()
def sparrowBuild = ""
if(headless) {
sparrowBuild = "Server"
}
group "com.sparrowwallet" group "com.sparrowwallet"
version "${sparrowVersion}" version "${sparrowVersion}"
@ -228,7 +224,7 @@ jlink {
addExtraDependencies("javafx") addExtraDependencies("javafx")
jpackage { jpackage {
imageName = "Sparrow" imageName = "Sparrow"
installerName = "Sparrow${sparrowBuild}" installerName = "Sparrow"
appVersion = "${sparrowVersion}" appVersion = "${sparrowVersion}"
skipInstaller = os.macOsX || properties.skipInstallers skipInstaller = os.macOsX || properties.skipInstallers
imageOptions = [] imageOptions = []
@ -255,7 +251,7 @@ task removeGroupWritePermission(type: Exec) {
} }
task packageZipDistribution(type: Zip) { task packageZipDistribution(type: Zip) {
archiveFileName = "Sparrow${sparrowBuild}-${sparrowVersion}.zip" archiveFileName = "Sparrow-${sparrowVersion}.zip"
destinationDirectory = file("$buildDir/jpackage") destinationDirectory = file("$buildDir/jpackage")
from("$buildDir/jpackage/") { from("$buildDir/jpackage/") {
include "Sparrow/**" include "Sparrow/**"
@ -265,7 +261,7 @@ task packageZipDistribution(type: Zip) {
task packageTarDistribution(type: Tar) { task packageTarDistribution(type: Tar) {
dependsOn removeGroupWritePermission dependsOn removeGroupWritePermission
archiveFileName = "sparrow${sparrowBuild.toLowerCase()}-${sparrowVersion}.tar.gz" archiveFileName = "sparrow-${sparrowVersion}.tar.gz"
destinationDirectory = file("$buildDir/jpackage") destinationDirectory = file("$buildDir/jpackage")
compression = Compression.GZIP compression = Compression.GZIP
from("$buildDir/jpackage/") { from("$buildDir/jpackage/") {