From 903993ec54a52012bb97b8ade39822599be6f1e1 Mon Sep 17 00:00:00 2001
From: Gauthier Roebroeck <gauthier.roebroeck@gmail.com>
Date: Fri, 11 Aug 2023 17:40:25 +0800
Subject: [PATCH] ci: add Conveyor

---
 .github/workflows/ci.yml |  50 ++++++++++++++++++++++++++++++---------
 apple.cer                | Bin 0 -> 1492 bytes
 conveyor.ci.conf         |  11 +++++++++
 3 files changed, 50 insertions(+), 11 deletions(-)
 create mode 100644 apple.cer
 create mode 100644 conveyor.ci.conf

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c2acf266..fbed2298 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,15 +27,17 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ 17, 19 ]
     name: Test JDK ${{ matrix.java }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 19
+          java-package: 'jdk'
+          distribution: 'temurin'
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 17
           java-package: 'jdk'
           distribution: 'temurin'
       - name: Build
@@ -46,13 +48,13 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: test-results-jdk-${{ matrix.java }}
+          name: test-results
           path: komga/build/test-results/
       - name: Upload Unit Test Reports
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: test-reports-jdk-${{ matrix.java }}
+          name: test-reports
           path: komga/build/reports/tests/
 
   webui:
@@ -125,6 +127,12 @@ jobs:
           cache-dependency-path: |
             package-lock.json
             komga-webui/package-lock.json
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '19'
+          java-package: 'jdk'
+          distribution: 'temurin'
+          cache: 'gradle'
       - uses: actions/setup-java@v3
         with:
           java-version: '17'
@@ -146,16 +154,36 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: :komga:copyWebDist :komga:generateOpenApiDocs :komga:bootJar :komga-tray:jar
+      - name: Run Conveyor
+        uses: hydraulic-software/conveyor/actions/build@v10.1
+        with:
+          command: -f conveyor.ci.conf make site -o ./output/release
+          signing_key: ${{ secrets.CONVEYOR_SIGNING_KEY }}
+          agree_to_license: 1
+        env:
+          APPLE_ASP: ${{ secrets.APPLE_ASP }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+      - name: Adjust Conveyor output
+        run: |
+          mkdir ./output/site
+          mv ./output/release/download.html ./output/site/index.html
+          mv ./output/release/icon.svg ./output/site/
+      - name: Deploy download page to Github Pages
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./output/site
+          cname: download.komga.org
       - name: JReleaser full release
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: copyWebDist generateOpenApiDocs jreleaserFullRelease
+          arguments: jreleaserFullRelease
         env:
           JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # workaround for https://github.com/jreleaser/jreleaser/issues/1232
-          JRELEASER_DOCKER_DEFAULT_PASSWORD: workaround
-          # workaround for https://github.com/jreleaser/jreleaser/discussions/1233
-          JRELEASER_DISTRIBUTIONS_KOMGA_DOCKER_REPOSITORY_ACTIVE: NEVER
       - name: JReleaser release output
         if: always()
         uses: actions/upload-artifact@v3
diff --git a/apple.cer b/apple.cer
new file mode 100644
index 0000000000000000000000000000000000000000..bc3796702a976cd809b74de105ea4e396974fb9a
GIT binary patch
literal 1492
zcmZWp3s6*L6yE>tWpS5XmWLvk+T|gI!1C{+!eXc_@{}=S*-Q$W-Fq*v%0AqCSwO>K
zug;odDFKP)H1RO8iBSjAu%RIXBP-L@@KL_PN1~H6%aEWL_TOL;r#o|I?)m@o`2KUw
zcOd6=7IJuJqYwia=4YIxd-O;->{>CLCO_Bp^LJ1t5-)USI!9yx_;?9mp)wXmi-bB{
zD2-T2+v!q^m9`OCD~VLv#u|%^q@Fce%tT5VTVk;p*-E7k6!YdjQY=HI421r?B9Tf`
ztkzPR$TE`(kA)}@(`n)S*)ml;OjJU+I9?4C^O2f3r6%M<$EV6UFjyoJ*GBHB8;YR-
zkV-OA^YeA8H{!EZN)22w0Z#oKI6m7Xv?L-UMVFVEm6l87zM7^%lDdj``B{i44@jTq
z0>1!5CXfgG-+kH(GFL$kgiS9R@Dd0)AQzx>3B~~+IKH;FYZ$9pbO>mZo4ytYb@y-o
zrrLFn=-`HXHDB%6cF|$itiDBE(h4GKd*{CXZSsRod)^gs=*FGxm)B^A7>@eLd;iTa
zI=HYVr|Z4(Zo+giGB~R9kMfWbN~z&CRo9)$e3PTsWXm^#xdGC$*j<}-?}s{K5}q{5
z_T}~{935N20#-cmtI?k4+}A%({r%QK`QE`QM}hWy*VaPc#d9L^zYip@ET47TJ@aI>
zA=LK}bF}JV#rV;@L^F9QYU5+~Sj|o5z`h?&ud5xq9P_YiXJ<rd+nKR}C8MYR2@e!D
zsAa8Z>-)ktht#_-G;dpW?9^zMqVU46O#$cbZyIk;#)LosS~x5na+n56QB~&!0`L^a
zpa8zeYvFh>462?vnj|&)+i(2U=DL4i-Q$G*Ufq%T&?cG@EdpL%-T>f5kb(-24l!p~
z3CmiO;^Ig&iHt(e514|qnBpkfZlsD;3W~Nt)s#JOMo!vWNX9zNoL6Cd?4%b|qQ=eV
zVG%e7W+BBNiH8&<<prSQDRlIB;$j$d9Fsaaa_Lf|-b~U2A_H4uWC$MB1V3oPP)X>`
zm4sDqW6>YOl$mIT(32!>WhZ=!kPpp^nc&}nM%RGY!k}A9Z=(p7wwaKFnIcGwnKJT>
zV+czTQO3|Q&n2>2kT0JMSx)8W`DwN3N!Ezqp_nXfqRpscFk$KuASjwI4uh&$US2+}
zIM1TcdJo0pU=UxQ1$+~wP~r(96vBD@xi21s&s^WNp<EMuCbRh6?omT_%hkUFs(Ya?
ze=X<Ta3SVhjk+)SZ`F{L2!!JPQn?CF?gGev`7m&r0oq4sX3$3R^kQN`A+7<zp$$nL
zRkn6@Nb&JX`e`dRaIS1uMNQp3@6LN|jj@N_pZG_uKj^*C>OA4sef#nrEPb#Sr}iz|
zAM!<G^P)eaqtfc}?8TM-CzI{-j;t;a%eJ^uBDd~7*4NtPTrj(ZRi|4FQGOLqhSVQ?
zc%xbVmf*<Qmb#vhfu*K+^)Gkv257gw<6LqwF1-A;8!K~`r#A$Q+!<N=<Ck?w!i>(f
zyCTWF9zWawRe9}m;ZIM%E5BX3&2B&L77PZD+`W3VKdjHx9Bx~_^rCCasf-!p%4=0Q
zV>z;fJ8u^c8V*;CE#R`Qw}@T)*GXO~*uDBQ!+^T1$$U-Se?lsA?e%u=(SAJiFNK-~
A?*IS*

literal 0
HcmV?d00001

diff --git a/conveyor.ci.conf b/conveyor.ci.conf
new file mode 100644
index 00000000..e50ec912
--- /dev/null
+++ b/conveyor.ci.conf
@@ -0,0 +1,11 @@
+include required("conveyor.conf")
+
+app {
+    mac.certificate = apple.cer
+
+    mac.notarization {
+        app-specific-password = ${env.APPLE_ASP}
+        team-id = GCZZU2X3J2
+        apple-id = ${env.APPLE_ID}
+    }
+}