Enable story capability

[signal-cli] / .github / workflows / repackage-native-libs.yml

diff --git a/.github/workflows/repackage-native-libs.yml b/.github/workflows/repackage-native-libs.yml
index 9f731bd71ca0af22f7db0fc6266f4a95f9c33b92..8ebba79eaad9c4768cb227f0d8f1958f7bfcc72b 100644 (file)
--- 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
 
   ci_wf:
     uses: AsamK/signal-cli/.github/workflows/ci.yml@master

-      # ${{ github.repository }} not accpeted here
+    # ${{ github.repository }} not accpeted here

 
 
   lib_to_jar:
 
 
   lib_to_jar:


@@ -24,14 +24,14 @@ jobs:
     steps:
 
       - name: Download signal-cli build from CI workflow
     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 .
 
       - name: Get signal-cli version
         id: cli_ver
         run: |
           #echo ${GITHUB_REF#refs/tag/}
           tree .

-          mv ./*/*.tar.gz .
+          mv ./$(ls */ -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}"
           ver=$(ls ./*.tar.gz | xargs basename | sed -E 's/signal-cli-(.*).tar.gz/\1/')
           echo $ver
           echo "::set-output name=signal_cli_version::${ver}"


@@ -40,7 +40,7 @@ jobs:
       - name: Get signal-client jar version
         id: lib_ver
         run: |
       - name: Get signal-client jar version
         id: lib_ver
         run: |

-          JAR_PREFIX=signal-client-java-
+          JAR_PREFIX=libsignal-client-

           jar_file=$(find ./signal-cli-*/lib/ -name "$JAR_PREFIX*.jar")
           jar_version=$(echo "$jar_file" | xargs basename | sed "s/$JAR_PREFIX//; s/.jar//")
           echo "$jar_version"
           jar_file=$(find ./signal-cli-*/lib/ -name "$JAR_PREFIX*.jar")
           jar_version=$(echo "$jar_file" | xargs basename | sed "s/$JAR_PREFIX//; s/.jar//")
           echo "$jar_version"


@@ -48,7 +48,7 @@ jobs:
 
       - name: Download signal-client builds
         env:
 
       - name: Download signal-client builds
         env:

-          RELEASES_URL: https://github.com/signalapp/libsignal-client/releases/download/
+          RELEASES_URL: https://github.com/signalapp/libsignal/releases/download/

           FILE_NAMES: signal_jni.dll libsignal_jni.dylib
           SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
         run: |
           FILE_NAMES: signal_jni.dll libsignal_jni.dylib
           SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
         run: |


@@ -63,7 +63,7 @@ jobs:
           SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
         run: |
           mv signal_jni.dll libsignal_jni.so
           SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
         run: |
           mv signal_jni.dll libsignal_jni.so

-          zip -u ./signal-cli-${SIGNAL_CLI_VER}/lib/signal-client-java-${SIGNAL_CLIENT_VER}.jar  ./libsignal_jni.so
+          zip -u ./signal-cli-${SIGNAL_CLI_VER}/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar  ./libsignal_jni.so

           tar -czf signal-cli-${SIGNAL_CLI_VER}-Windows.tar.gz signal-cli-${SIGNAL_CLI_VER}/
 
       - name: Replace macOS lib
           tar -czf signal-cli-${SIGNAL_CLI_VER}-Windows.tar.gz signal-cli-${SIGNAL_CLI_VER}/
 
       - name: Replace macOS lib


@@ -71,7 +71,7 @@ jobs:
           SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.signal_cli_version }}
           SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
         run: |
           SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.signal_cli_version }}
           SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
         run: |

-          jar_file=./signal-cli-${SIGNAL_CLI_VER}/lib/signal-client-java-${SIGNAL_CLIENT_VER}.jar
+          jar_file=./signal-cli-${SIGNAL_CLI_VER}/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar

           zip -d "$jar_file" libsignal_jni.so
           zip "$jar_file" libsignal_jni.dylib
           tar -czf signal-cli-${SIGNAL_CLI_VER}-macOS.tar.gz signal-cli-${SIGNAL_CLI_VER}/
           zip -d "$jar_file" libsignal_jni.so
           zip "$jar_file" libsignal_jni.dylib
           tar -czf signal-cli-${SIGNAL_CLI_VER}-macOS.tar.gz signal-cli-${SIGNAL_CLI_VER}/


@@ -135,7 +135,7 @@ jobs:
         shell: bash   # Explicit for windows
 
     env:
         shell: bash   # Explicit for windows
 
     env:

-      JAVA_VERSION: 17
+      JAVA_VERSION: 18

 
     steps:
 
 
     steps:
 


@@ -159,8 +159,9 @@ jobs:
           tar -xzf "$file_name"
 
       - name: Set up JDK for running signal-cli executable
           tar -xzf "$file_name"
 
       - name: Set up JDK for running signal-cli executable

-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3

         with:
         with:

+          distribution: 'adopt'

           java-version: ${{ env.JAVA_VERSION }}
 
       - name: Run signal-cli
           java-version: ${{ env.JAVA_VERSION }}
 
       - name: Run signal-cli