Skip to content

Commit f98fe7f

Browse files
author
Duncan
committed
Merge remote-tracking branch 'origin/main' into duncan/thread-load-flake-fix
* origin/main: (33 commits) perf(desktop): make the Projects surface render-cheap (#6460) refactor(acp): clarify agent prompt sections (#6501) Add mobile Huddles voice MVP (#6056) feat(desktop-messages): keep agents addressed across messages (#6315) fix(desktop): remove Buzz entity link previews (#6512) fix(composer): preserve caret when inserting mentions mid-message (#6531) chore(deps): update rust crate async-trait to v0.1.92 (#6094) chore(deps): update dependency sonner to v2.0.8 (#6093) chore(deps): update rust crate http-body-util to v0.1.4 (#5452) chore(deps): update rust crate http to v1.4.2 (#5451) chore(deps): update rust crate futures-util to v0.3.33 (#5448) chore(deps): update rust crate futures to v0.3.33 (#5445) chore(deps): update dependency @tauri-apps/api to v2.11.1 (#5444) chore(deps): update ubuntu:24.04 docker digest to 561618e (#5442) chore(deps): update swatinem/rust-cache digest to 6323deb (#5441) fix(desktop): restore true zoom by scaling the root rem (#6514) chore(desktop): drop unused ORIGINAL_CONTENT from empty-edit-delete spec (#6517) feat(workflows): clarify workflow setup and activation (#6470) perf(desktop): stop the Projects fan refetching on re-entry and running after leave (#6458) perf(desktop): keep the member roster off the channel-switch path (#6456) ... Signed-off-by: Duncan <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@buzz.block.builderlab.xyz>
2 parents 4ea3d9f + 040b203 commit f98fe7f

385 files changed

Lines changed: 38422 additions & 4730 deletions

File tree

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
steps:
102102
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
103103
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
104-
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
104+
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
105105
with:
106106
save-if: ${{ github.event_name != 'pull_request' }}
107107
- name: Format check
@@ -123,7 +123,7 @@ jobs:
123123
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
124124
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
125125
- uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1
126-
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
126+
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
127127
with:
128128
save-if: ${{ github.event_name != 'pull_request' }}
129129
- name: Install cargo-nextest
@@ -147,7 +147,7 @@ jobs:
147147
fetch-depth: 2
148148
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
149149
- uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1
150-
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
150+
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
151151
with:
152152
workspaces: desktop/src-tauri
153153
save-if: ${{ github.event_name != 'pull_request' }}
@@ -340,7 +340,7 @@ jobs:
340340
key: relay-artifacts-${{ runner.os }}-${{ hashFiles('crates/**', 'migrations/**', 'Dockerfile', 'Cargo.toml', 'Cargo.lock', 'rust-toolchain.toml', '.cargo/config.toml', '.github/workflows/ci.yml') }}
341341
- uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1
342342
if: steps.relay-artifacts-cache.outputs.cache-hit != 'true'
343-
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
343+
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
344344
if: steps.relay-artifacts-cache.outputs.cache-hit != 'true'
345345
with:
346346
workspaces: |
@@ -763,7 +763,7 @@ jobs:
763763
steps:
764764
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
765765
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
766-
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
766+
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
767767
with:
768768
save-if: ${{ github.event_name != 'pull_request' }}
769769
# Reuse the relay + git-credential-nostr built by Desktop E2E Relay
@@ -952,7 +952,7 @@ jobs:
952952
steps:
953953
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
954954
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
955-
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
955+
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
956956
with:
957957
key: cross-${{ matrix.target }}
958958
save-if: ${{ github.event_name != 'pull_request' }}
@@ -993,7 +993,7 @@ jobs:
993993
# toolchain (1.95.0 + clippy via profile = default) comes from the
994994
# repo-root rust-toolchain.toml, which the runner's preinstalled rustup
995995
# honors on demand; the host triple already is x86_64-pc-windows-msvc.
996-
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
996+
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
997997
with:
998998
workspaces: |
999999
.
@@ -1070,7 +1070,7 @@ jobs:
10701070
steps:
10711071
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
10721072
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
1073-
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
1073+
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
10741074
with:
10751075
workspaces: desktop/src-tauri
10761076
save-if: ${{ github.event_name != 'pull_request' }}

.github/workflows/desktop-release-cache-proof.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
name: Prove Linux cache visibility
6868
if: github.repository == 'block/buzz'
6969
runs-on: ubuntu-latest
70-
container: ubuntu:24.04@sha256:4fbb8e6a8395de5a7550b33509421a2bafbc0aab6c06ba2cef9ebffbc7092d90
70+
container: ubuntu:24.04@sha256:561618e2c15bf2397621dd04f96926663a3b5616c189cf7e38db7e82f5c538ea
7171
timeout-minutes: 15
7272
defaults:
7373
run:

.github/workflows/linux-canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Build Linux canary
2222
if: github.repository == 'block/buzz'
2323
runs-on: ubuntu-latest
24-
container: ubuntu:24.04@sha256:4fbb8e6a8395de5a7550b33509421a2bafbc0aab6c06ba2cef9ebffbc7092d90
24+
container: ubuntu:24.04@sha256:561618e2c15bf2397621dd04f96926663a3b5616c189cf7e38db7e82f5c538ea
2525
timeout-minutes: 60
2626
permissions:
2727
contents: read

.github/workflows/mesh-lifecycle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
5757

58-
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
58+
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
5959
with:
6060
save-if: ${{ github.event_name != 'pull_request' }}
6161

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ jobs:
428428
if: github.repository == 'block/buzz'
429429
runs-on: ubuntu-latest
430430
# Digest-pinned like the SHA-pinned actions below; Renovate keeps it fresh.
431-
container: ubuntu:24.04@sha256:4fbb8e6a8395de5a7550b33509421a2bafbc0aab6c06ba2cef9ebffbc7092d90
431+
container: ubuntu:24.04@sha256:561618e2c15bf2397621dd04f96926663a3b5616c189cf7e38db7e82f5c538ea
432432
needs: setup
433433
timeout-minutes: 60
434434
permissions:
@@ -511,7 +511,7 @@ jobs:
511511

512512
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
513513

514-
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
514+
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2
515515
with:
516516
workspaces: desktop/src-tauri
517517
lookup-only: true

.release/desktop-candidate.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"schema": 2,
3-
"version": "0.5.17",
4-
"base_sha": "3fdf289b78c40f80abce86575c25b5ed6361d82c",
5-
"previous_tag": "desktop-v0.5.16",
6-
"previous_base_sha": "ee992ff0822f44d1c308822f116cb9d26f9a3386",
7-
"previous_merge_sha": "978e585e8df893fe55aded854de07996b9412678",
8-
"tag": "desktop-v0.5.17",
9-
"commit_count": 5
3+
"version": "0.5.18",
4+
"base_sha": "aea0ef8df9fc24d9aa8bf5c761ab2910026a601b",
5+
"previous_tag": "desktop-v0.5.17",
6+
"previous_base_sha": "3fdf289b78c40f80abce86575c25b5ed6361d82c",
7+
"previous_merge_sha": "8232299cbe6d90692fac3de46cde0ec123edd6c1",
8+
"tag": "desktop-v0.5.18",
9+
"commit_count": 66
1010
}

0 commit comments

Comments
 (0)