Skip to content

Commit 89dbf9d

Browse files
committed
Merge tag 'v0.86.2' into ci
v0.86.2 - backups: Include more account fields into the exported JSON - backups: Throw validator errors if multiple contacts have the same username (a case-insensitive check)
2 parents 2ce1b05 + 2dcd1e0 commit 89dbf9d

File tree

149 files changed

+1418
-4541
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+1418
-4541
lines changed

.github/actions/restore-cargo-cache/action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ outputs:
1818
cache-key-current:
1919
description: 'Hash of current working tree'
2020
value: ${{ steps.calculate.outputs['cache-key-current'] }}
21+
cache-key:
22+
description: 'Full cache key used for cargo artifacts'
23+
value: ${{ steps.cache.outputs['cache-primary-key'] }}
2124
runs:
2225
using: 'composite'
2326
steps:
@@ -27,7 +30,8 @@ runs:
2730
run: python3 "${{ github.action_path }}/calculate_cache_keys.py" --toolchain "${{ inputs.toolchain }}" >> "$GITHUB_OUTPUT"
2831

2932
- name: Restore cargo cache
30-
uses: runs-on/cache@3a15256b3556fbc5ae15f7f04598e4c7680e9c25 # v4
33+
id: cache
34+
uses: runs-on/cache/restore@3a15256b3556fbc5ae15f7f04598e4c7680e9c25 # v4
3135
with:
3236
# The special handling for the Windows target path comes because we overwrite
3337
# $CARGO_BUILD_TARGET_DIR in build_node_bridge.py because Visual Studio's CLI
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: 'Save Cargo Cache'
2+
description: 'Save cargo and build cache artifacts with appropriate keys'
3+
inputs:
4+
key:
5+
description: 'The cache key to save under'
6+
required: true
7+
runs:
8+
using: 'composite'
9+
steps:
10+
- name: Save cargo cache
11+
if: ${{ github.ref == 'refs/heads/main' }}
12+
uses: runs-on/cache/save@3a15256b3556fbc5ae15f7f04598e4c7680e9c25 # v4
13+
with:
14+
# Keep this path list in sync with restore-cargo-cache/action.yml.
15+
path: |
16+
~/.cargo/registry/index
17+
~/.cargo/registry/cache
18+
~/.cargo/registry/src
19+
~/.cargo/git/db
20+
~/.cargo/git/checkouts
21+
target
22+
${{ runner.os == 'Windows' && format('{0}\\libsignal', runner.temp) || '' }}
23+
key: ${{ inputs.key }}

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.11.1
1+
22.20.0

CODING_GUIDELINES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ These should usually be prioritized in that order, but adjust the trade-off as n
8181

8282
# Java
8383

84-
- Many of our APIs are shared between Android and Server, and we also run the client tests on desktop machines, so **stick to Java 8** unless you've verified that something newer is available on Android (back to our earliest supported version, API level 21, at the time of this writing), and don't use Android-specific APIs unless you're actually in Android-specific code. (This *should* be checked in CI but things have slipped through before, and it'll save you time to know whether you're allowed to use something.)
84+
- Many of our APIs are shared between Android and Server, and we also run the client tests on desktop machines, so **stick to Java 8** unless you've verified that something newer is available on Android (back to our earliest supported version, API level 23, at the time of this update), and don't use Android-specific APIs unless you're actually in Android-specific code. (This *should* be checked in CI but things have slipped through before, and it'll save you time to know whether you're allowed to use something.)
8585

8686
- **Put server-specific APIs in the server/ folder if they're not needed to test client features**, so they don't add code size for Android.
8787

Cargo.lock

Lines changed: 12 additions & 123 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ default-members = [
3737
resolver = "2" # so that our dev-dependency features don't leak into products
3838

3939
[workspace.package]
40-
version = "0.85.2"
40+
version = "0.86.2"
4141
authors = ["Signal Messenger LLC"]
4242
license = "AGPL-3.0-only"
4343
rust-version = "1.85"
@@ -140,6 +140,7 @@ hmac = "0.12.0"
140140
hpke-rs = "0.3.0"
141141
hpke-rs-crypto = "0.3.0"
142142
http = "1.3.0"
143+
http-body = "1.0.1"
143144
http-body-util = "0.1.3"
144145
hyper = "1.7"
145146
hyper-util = "0.1.17"
@@ -206,9 +207,9 @@ tokio-socks = "0.5.2"
206207
tokio-stream = "0.1.16"
207208
tokio-tungstenite = "0.27.0"
208209
tokio-util = "0.7.11"
209-
tonic = "0.13.1"
210+
tonic = { version = "0.13.1", default-features = false }
210211
tonic-build = "0.13.1"
211-
tower = "0.5.2"
212+
tower-service = "0.3.3"
212213
tungstenite = "0.27.0"
213214
unicode-segmentation = "1.12.0"
214215
url = "2.4.1"

0 commit comments

Comments
 (0)