X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/59b2d2f5a193c0f8524c80b790c22d2c4899663c..207764e0be91aeb9a6c52fa8639a822555f8759a:/.github/workflows/repackage-native-libs.yml?ds=sidebyside

diff --git a/.github/workflows/repackage-native-libs.yml b/.github/workflows/repackage-native-libs.yml
index 9a87f723..6d334ecf 100644
--- a/.github/workflows/repackage-native-libs.yml
+++ b/.github/workflows/repackage-native-libs.yml
@@ -10,7 +10,7 @@ jobs:
 
   ci_wf:
     uses: AsamK/signal-cli/.github/workflows/ci.yml@master
-      # ${{ github.repository }} not accpeted here
+    # ${{ github.repository }} not accepted here
 
 
   lib_to_jar:
@@ -24,14 +24,14 @@ jobs:
     steps:
 
       - name: Download signal-cli build from CI workflow
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
 
       - name: Get signal-cli version
         id: cli_ver
         run: |
           #echo ${GITHUB_REF#refs/tag/}
           tree .
-          mv ./*/*.tar.gz .
+          mv ./$(ls signal-cli-archive-*/ -d | tail -n1)/*.tar.gz .
           ver=$(ls ./*.tar.gz | xargs basename | sed -E 's/signal-cli-(.*).tar.gz/\1/')
           echo $ver
           echo "::set-output name=signal_cli_version::${ver}"
@@ -57,6 +57,12 @@ jobs:
           done
           tree .
 
+      - name: Compress native app
+        env:
+          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.signal_cli_version }}
+        run: |
+          tar -czf signal-cli-${SIGNAL_CLI_VER}-Linux-native.tar.gz -C signal-cli-native signal-cli
+
       - name: Replace Windows lib
         env:
           SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.signal_cli_version }}
@@ -96,6 +102,16 @@ jobs:
           asset_name: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-Linux.tar.gz
           asset_content_type: application/x-compressed-tar  # .tar.gz
 
+      - name: Upload Linux native archive
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-Linux-native.tar.gz
+          asset_name: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-Linux-native.tar.gz
+          asset_content_type: application/x-compressed-tar  # .tar.gz
+
       - name: Upload windows archive
         uses: actions/upload-release-asset@v1
         env:
@@ -135,7 +151,7 @@ jobs:
         shell: bash   # Explicit for windows
 
     env:
-      JAVA_VERSION: 18
+      JAVA_VERSION: 19
 
     steps:
 
@@ -159,8 +175,9 @@ jobs:
           tar -xzf "$file_name"
 
       - name: Set up JDK for running signal-cli executable
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'adopt'
           java-version: ${{ env.JAVA_VERSION }}
 
       - name: Run signal-cli