X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/e4a4788d5efde9c68c2d5464adddde4c94dd81a8..5351445fc51dc0eacc4242cfa92bc41a346a6f25:/.github/workflows/ci.yml?ds=sidebyside

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a6c3f08c..ad4dbf15 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,14 @@
 name: signal-cli CI
 
-on: [ push, pull_request, workflow_call ]
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+  workflow_call:
+
+permissions:
+  contents: write # to fetch code (actions/checkout) and submit dependency graph (gradle/gradle-build-action)
 
 jobs:
   build:
@@ -8,21 +16,36 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17', '18' ]
+        java: [ '21', '24' ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
+          distribution: 'zulu'
           java-version: ${{ matrix.java }}
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          dependency-graph: generate-and-submit
+      - name: Install asciidoc
+        run: sudo apt update && sudo apt --no-install-recommends install -y asciidoc-base
       - name: Build with Gradle
         run: ./gradlew --no-daemon build
+      - name: Build man page
+        run: |
+          cd man
+          make install
+      - name: Add man page to archive
+        run: |
+          version=$(tar tf build/distributions/signal-cli-*.tar | head -n1 | sed 's|signal-cli-\([^/]*\)/.*|\1|')
+          echo $version
+          tar --transform="flags=r;s|man|signal-cli-${version}/man|" -rf build/distributions/signal-cli-${version}.tar man/man{1,5}
       - name: Compress archive
         run: gzip -n -9 build/distributions/signal-cli-*.tar
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: signal-cli-archive-${{ matrix.java }}
           path: build/distributions/signal-cli-*.tar.gz
@@ -32,17 +55,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
           version: 'latest'
-          java-version: '17'
-          components: 'native-image'
+          java-version: '21'
+          cache: 'gradle'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build with Gradle
         run: ./gradlew --no-daemon nativeCompile
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: signal-cli-native
           path: build/native/nativeCompile/signal-cli