From 4c5a784b1e683a4eb892e540c14b8ff2eca6b7fd Mon Sep 17 00:00:00 2001 From: Syer10 Date: Fri, 9 Jul 2021 00:07:17 -0400 Subject: [PATCH] Use gradle to get Tachidesk.jar when required --- .github/workflows/Build.yml | 55 ++++----- .run/TachideskJUI [run].run.xml | 3 +- build.gradle.kts | 11 +- buildSrc/build.gradle.kts | 16 +++ buildSrc/src/main/kotlin/Config.kt | 6 + buildSrc/src/main/kotlin/TachideskTasks.kt | 125 +++++++++++++++++++++ scripts/BuildLinuxDeb.sh | 15 --- scripts/BuildLinuxRpm.sh | 14 --- scripts/BuildMacDmg.sh | 13 --- scripts/BuildUnixJar.sh | 14 --- scripts/BuildWindowsExe.ps1 | 15 --- scripts/BuildWindowsJar.ps1 | 15 --- scripts/BuildWindowsMsi.ps1 | 15 --- scripts/SetupUnix.sh | 41 ------- scripts/SetupWindows.ps1 | 43 ------- 15 files changed, 185 insertions(+), 216 deletions(-) create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/src/main/kotlin/Config.kt create mode 100644 buildSrc/src/main/kotlin/TachideskTasks.kt delete mode 100755 scripts/BuildLinuxDeb.sh delete mode 100755 scripts/BuildLinuxRpm.sh delete mode 100755 scripts/BuildMacDmg.sh delete mode 100755 scripts/BuildUnixJar.sh delete mode 100644 scripts/BuildWindowsExe.ps1 delete mode 100644 scripts/BuildWindowsJar.ps1 delete mode 100644 scripts/BuildWindowsMsi.ps1 delete mode 100755 scripts/SetupUnix.sh delete mode 100644 scripts/SetupWindows.ps1 diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index ff15c50a..b7e9505e 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -1,5 +1,3 @@ -# This is a basic workflow to help you get started with Actions - name: CI on: @@ -18,32 +16,28 @@ jobs: arch: x64 os: ubuntu-latest shell: bash - buildPackage: ./scripts/BuildLinuxDeb.sh - buildJar: ./scripts/BuildUnixJar.sh + build: setupTachideskJar packageUberJarForCurrentOS packageDeb setupCl: ./scripts/SetupClUnix.sh - runtime: linux-centos-x64 arch: x64 os: ubuntu-latest shell: bash - buildPackage: ./scripts/BuildLinuxRpm.sh - buildJar: ./scripts/BuildUnixJar.sh + build: setupTachideskJar packageRpm setupCl: ./scripts/SetupClUnix.sh - runtime: osx-x64 arch: x64 os: macOS-latest shell: bash - buildPackage: ./scripts/BuildMacDmg.sh - buildJar: ./scripts/BuildUnixJar.sh + build: setupTachideskJar packageUberJarForCurrentOS setupCl: ./scripts/SetupClUnix.sh - runtime: win-x64 arch: x64 os: windows-latest shell: powershell - buildPackage: ./scripts/BuildWindowsMsi.ps1 - buildJar: ./scripts/BuildWindowsJar.ps1 + build: setupTachideskJar packageUberJarForCurrentOS packageMsi setupCl: ./scripts/SetupClWindows.ps1 runs-on: ${{ matrix.os }} @@ -63,35 +57,44 @@ jobs: - name: Setup Cl run: ${{ matrix.setupCl }} - - name: Build Package - if: ${{ matrix.runtime != 'linux-centos-x64' && matrix.runtime != 'osx-x64' }} - run: ${{ matrix.buildPackage }} - - - name: Build MacOS Package + - name: Setup MacOS Keychain if: ${{ matrix.runtime == 'osx-x64' }} run: | echo ${{ secrets.APPLE_CERT }} | base64 --decode > certificate.p12 - security create-keychain -p ${{ secrets.APPLE_KEYCHAIN_PASSWORD }} build.keychain + security create-keychain -p ${{ secrets.APPLE_KEYCHAIN_PASSWORD }} build.keychain security default-keychain -s build.keychain security unlock-keychain -p ${{ secrets.APPLE_KEYCHAIN_PASSWORD }} build.keychain security import certificate.p12 -k build.keychain -P ${{ secrets.APPLE_CERT_PASSWORD }} -T /usr/bin/codesign security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k ${{ secrets.APPLE_KEYCHAIN_PASSWORD }} build.keychain - ${{ matrix.buildPackage }} notarizeDmg \ - -Pcompose.desktop.mac.sign=true \ - -Pcompose.desktop.mac.signing.identity=${{ secrets.APPLE_IDENTITY }} \ - -Pcompose.desktop.mac.notarization.appleID=${{ secrets.APPLE_ID }} \ - -Pcompose.desktop.mac.notarization.password=${{ secrets.APPLE_PASSWORD }} - - - name: Build Jar - if: ${{ matrix.runtime != 'linux-centos-x64' }} - run: ${{ matrix.buildJar }} + - name: Build Mac Package + if: ${{ matrix.runtime == 'osx-x64' }} + uses: eskatos/gradle-command-action@v1 + with: + arguments: | + packageDmg notarizeDmg \ + -Pcompose.desktop.mac.sign=true \ + -Pcompose.desktop.mac.signing.identity=${{ secrets.APPLE_IDENTITY }} \ + -Pcompose.desktop.mac.notarization.appleID=${{ secrets.APPLE_ID }} \ + -Pcompose.desktop.mac.notarization.password=${{ secrets.APPLE_PASSWORD }} + wrapper-cache-enabled: true + dependencies-cache-enabled: true + configuration-cache-enabled: true - name: Build rpm Package if: ${{ matrix.runtime == 'linux-centos-x64' }} uses: Syer10/CentOS-Java15-Action@v1 with: - command: ${{ matrix.buildPackage }} + command: ./gradlew ${{ matrix.build }} + + - name: Build + if: ${{ matrix.runtime != 'linux-centos-x64' }} + uses: eskatos/gradle-command-action@v1 + with: + arguments: ${{ matrix.build }} + wrapper-cache-enabled: true + dependencies-cache-enabled: true + configuration-cache-enabled: true # Upload runner package tar.gz/zip as artifact - name: Publish Artifact diff --git a/.run/TachideskJUI [run].run.xml b/.run/TachideskJUI [run].run.xml index 1adcd27e..9c809de7 100644 --- a/.run/TachideskJUI [run].run.xml +++ b/.run/TachideskJUI [run].run.xml @@ -10,10 +10,11 @@ -