Merge branch 'main' into patch-v0.52.3

gluonhq · Jul 26, 2024 · 670814f · 670814f
2 parents a4a0663 + ea1a751
commit 670814f
Show file tree

Hide file tree

Showing 82 changed files with 4,046 additions and 453 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -23,7 +23,7 @@ jobs:
       contents: read
       pull-requests: read
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     outputs:
       rust: ${{ steps.filter.outputs.rust }}
@@ -95,7 +95,7 @@ jobs:
   rust:
     name: Rust
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     needs: changes
 
@@ -166,6 +166,12 @@ jobs:
       run: PATH="$PATH:$PWD/local-tools/bin" ./bin/regenerate_acknowledgments.sh && git diff --name-status --exit-code acknowledgments
       if: matrix.version == 'nightly'
 
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+      with:
+        version: '3.x'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Build
       run: cargo +${{ matrix.toolchain }} build --workspace --features libsignal-ffi/signal-media --verbose ${{ matrix.cargo-keep-going }}
 
@@ -255,7 +261,7 @@ jobs:
   java:
     name: Java
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     needs: changes
 
@@ -284,6 +290,12 @@ jobs:
 
     - run: rustup toolchain install $(cat rust-toolchain) --profile minimal --target aarch64-linux-android,armv7-linux-androideabi,x86_64-linux-android,i686-linux-android
 
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+      with:
+        version: '3.x'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Verify that the JNI bindings are up to date
       run: rust/bridge/jni/bin/gen_java_decl.py --verify
 
@@ -306,7 +318,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-20.04, windows-latest, macos-latest]
 
     needs: changes
 
@@ -342,7 +354,7 @@ jobs:
 
     - name: Verify that the Node bindings are up to date
       run: rust/bridge/node/bin/gen_ts_decl.py --verify
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-20.04'
 
     - run: yarn install --frozen-lockfile
       working-directory: node
@@ -354,11 +366,11 @@ jobs:
       working-directory: node
 
     - run: yarn lint
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-20.04'
       working-directory: node
 
     - run: yarn format -c
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-20.04'
       working-directory: node
 
     - run: yarn test
@@ -367,7 +379,7 @@ jobs:
   swift_package:
     name: Swift Package
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     needs: changes
 

diff --git a/.github/workflows/jni_artifacts.yml b/.github/workflows/jni_artifacts.yml
@@ -56,6 +56,12 @@ jobs:
     - run: rustup target add ${{ matrix.additional-rust-target }}
       if: ${{ matrix.additional-rust-target != '' }}
 
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+      with:
+        version: '3.x'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+
     # install nasm compiler for boring
     - name: Install nasm
       if: startsWith(matrix.os, 'windows')
@@ -90,30 +96,30 @@ jobs:
         name: libsignal_jni (${{matrix.os}})
         path: target/release/${{ matrix.library }}
 
-  verify-rust:
-    name: Verify JNI bindings
-    runs-on: ubuntu-latest
-
-    timeout-minutes: 45
-
-    steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      with:
-        submodules: recursive
-
-    - run: rustup toolchain install $(cat rust-toolchain) --profile minimal
-
-    - run: sudo apt-get update && sudo apt-get install protobuf-compiler
-
-    - name: Verify that the JNI bindings are up to date
-      run: rust/bridge/jni/bin/gen_java_decl.py --verify
+#  verify-rust:
+#    name: Verify JNI bindings
+#    runs-on: ubuntu-latest
+#
+#    timeout-minutes: 45
+#
+#    steps:
+#    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+#      with:
+#        submodules: recursive
+#
+#    - run: rustup toolchain install $(cat rust-toolchain) --profile minimal
+#
+#    - run: sudo apt-get update && sudo apt-get install protobuf-compiler
+#
+#    - name: Verify that the JNI bindings are up to date
+#      run: rust/bridge/jni/bin/gen_java_decl.py --verify
 
   publish:
     name: Build for production and publish
 
     runs-on: ubuntu-latest
 
-    needs: [build, verify-rust]
+    needs: build
 
     timeout-minutes: 45
 
@@ -131,6 +137,12 @@ jobs:
     - name: Copy libraries
       run: mv ${{ steps.download.outputs.download-path }}/*/* java/shared/resources && find java/shared/resources
 
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+      with:
+        version: '3.x'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+
     - run: make
       if: ${{ inputs.dry_run }}
       working-directory: java
@@ -160,6 +172,8 @@ jobs:
       if: ${{ !inputs.dry_run }}
       working-directory: java
       env:
+        ORG_GRADLE_PROJECT_sonatypeRepo: ${{ secrets.SONATYPE_REPO }}
+        ORG_GRADLE_PROJECT_sonatypeSnapshotRepo: ${{ secrets.SONATYPE_SNAPSHOT_REPO }}
         ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
         ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_KEYID }}

diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@
 \#*\#
 .\#*
 
+java/**/bin
 java/**/build
 java/.gradle
 java/local.properties