Skip to content

Commit ba919d7

Browse files
authored
Merge branch 'main' into msc3861
2 parents b8ea41b + 6be7249 commit ba919d7

File tree

6 files changed

+57
-57
lines changed

6 files changed

+57
-57
lines changed

.github/workflows/dendrite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
cache: true
3838

3939
- name: Install Node
40-
uses: actions/setup-node@v2
40+
uses: actions/setup-node@v4
4141
with:
4242
node-version: 14
4343

.github/workflows/helm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
version: v3.10.0
3333

3434
- name: Run chart-releaser
35-
uses: helm/chart-releaser-action@v1.6.0
35+
uses: helm/chart-releaser-action@v1.7.0
3636
env:
3737
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
3838
with:

.github/workflows/k8s.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
python-version: 3.11
2929
check-latest: true
30-
- uses: helm/chart-testing-action@v2.6.1
30+
- uses: helm/chart-testing-action@v2.7.0
3131
- name: Get changed status
3232
id: list-changed
3333
run: |
@@ -62,7 +62,7 @@ jobs:
6262
with:
6363
python-version: "3.10"
6464
- name: Set up chart-testing
65-
uses: helm/chart-testing-action@v2.6.1
65+
uses: helm/chart-testing-action@v2.7.0
6666
- name: Create k3d cluster
6767
uses: nolar/setup-k3d-k3s@v1
6868
with:

.github/workflows/schedules.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ jobs:
254254
- uses: actions/checkout@v4
255255
with:
256256
repository: matrix-org/matrix-react-sdk
257-
- uses: actions/setup-node@v3
257+
- uses: actions/setup-node@v4
258258
with:
259259
cache: 'yarn'
260260
- name: Fetch layered build
@@ -272,7 +272,7 @@ jobs:
272272
run: |
273273
sed -i '/HOMESERVER/c\ HOMESERVER: "dendrite",' cypress.config.ts
274274
- name: "Run cypress tests"
275-
uses: cypress-io/github-action@v4.1.1
275+
uses: cypress-io/github-action@v6.7.10
276276
with:
277277
browser: chrome
278278
start: npx serve -p 8080 ./element-web/webapp
@@ -294,7 +294,7 @@ jobs:
294294
- uses: actions/checkout@v4
295295
with:
296296
repository: matrix-org/matrix-react-sdk
297-
- uses: actions/setup-node@v3
297+
- uses: actions/setup-node@v4
298298
with:
299299
cache: 'yarn'
300300
- name: Fetch layered build
@@ -312,7 +312,7 @@ jobs:
312312
run: |
313313
sed -i '/HOMESERVER/c\ HOMESERVER: "dendritePinecone",' cypress.config.ts
314314
- name: "Run cypress tests"
315-
uses: cypress-io/github-action@v4.1.1
315+
uses: cypress-io/github-action@v6.7.10
316316
with:
317317
browser: chrome
318318
start: npx serve -p 8080 ./element-web/webapp

go.mod

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ require (
44
github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d
55
github.com/DATA-DOG/go-sqlmock v1.5.0
66
github.com/MFAshby/stdemuxerhook v1.0.0
7-
github.com/Masterminds/semver/v3 v3.1.1
8-
github.com/blevesearch/bleve/v2 v2.4.0
7+
github.com/Masterminds/semver/v3 v3.3.1
8+
github.com/blevesearch/bleve/v2 v2.4.4
99
github.com/codeclysm/extract v2.2.0+incompatible
1010
github.com/coder/websocket v1.8.12
1111
github.com/cretz/bine v0.2.0
@@ -29,7 +29,7 @@ require (
2929
github.com/matrix-org/pinecone v0.11.1-0.20230810010612-ea4c33717fd7
3030
github.com/matrix-org/util v0.0.0-20221111132719-399730281e66
3131
github.com/mattn/go-sqlite3 v1.14.24
32-
github.com/nats-io/nats-server/v2 v2.10.24
32+
github.com/nats-io/nats-server/v2 v2.10.25
3333
github.com/nats-io/nats.go v1.38.0
3434
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
3535
github.com/opentracing/opentracing-go v1.2.0
@@ -42,15 +42,15 @@ require (
4242
github.com/tidwall/sjson v1.2.5
4343
github.com/uber/jaeger-client-go v2.30.0+incompatible
4444
github.com/uber/jaeger-lib v2.4.1+incompatible
45-
github.com/yggdrasil-network/yggdrasil-go v0.5.11
45+
github.com/yggdrasil-network/yggdrasil-go v0.5.12
4646
github.com/yggdrasil-network/yggquic v0.0.0-20241212194307-0d495106021f
4747
go.uber.org/atomic v1.11.0
48-
golang.org/x/crypto v0.31.0
48+
golang.org/x/crypto v0.32.0
4949
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
5050
golang.org/x/image v0.18.0
5151
golang.org/x/mobile v0.0.0-20240520174638-fa72addaaa1b
5252
golang.org/x/sync v0.10.0
53-
golang.org/x/term v0.27.0
53+
golang.org/x/term v0.28.0
5454
gopkg.in/h2non/bimg.v1 v1.1.9
5555
gopkg.in/yaml.v2 v2.4.0
5656
gotest.tools/v3 v3.5.1
@@ -59,20 +59,20 @@ require (
5959
)
6060

6161
require (
62-
github.com/Arceliar/ironwood v0.0.0-20241210120540-9deb08d9f8f9 // indirect
62+
github.com/Arceliar/ironwood v0.0.0-20241213013129-743fe2fccbd3 // indirect
6363
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
6464
github.com/Microsoft/go-winio v0.5.2 // indirect
65-
github.com/RoaringBitmap/roaring v1.2.3 // indirect
65+
github.com/RoaringBitmap/roaring v1.9.3 // indirect
6666
github.com/beorn7/perks v1.0.1 // indirect
6767
github.com/bits-and-blooms/bitset v1.13.0 // indirect
6868
github.com/bits-and-blooms/bloom/v3 v3.7.0 // indirect
69-
github.com/blevesearch/bleve_index_api v1.1.6 // indirect
69+
github.com/blevesearch/bleve_index_api v1.1.12 // indirect
7070
github.com/blevesearch/geo v0.1.20 // indirect
71-
github.com/blevesearch/go-faiss v1.0.13 // indirect
71+
github.com/blevesearch/go-faiss v1.0.24 // indirect
7272
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
7373
github.com/blevesearch/gtreap v0.1.1 // indirect
7474
github.com/blevesearch/mmap-go v1.0.4 // indirect
75-
github.com/blevesearch/scorch_segment_api/v2 v2.2.9 // indirect
75+
github.com/blevesearch/scorch_segment_api/v2 v2.2.16 // indirect
7676
github.com/blevesearch/segment v0.9.1 // indirect
7777
github.com/blevesearch/snowballstem v0.9.0 // indirect
7878
github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect
@@ -81,8 +81,8 @@ require (
8181
github.com/blevesearch/zapx/v12 v12.3.10 // indirect
8282
github.com/blevesearch/zapx/v13 v13.3.10 // indirect
8383
github.com/blevesearch/zapx/v14 v14.3.10 // indirect
84-
github.com/blevesearch/zapx/v15 v15.3.13 // indirect
85-
github.com/blevesearch/zapx/v16 v16.0.12 // indirect
84+
github.com/blevesearch/zapx/v15 v15.3.16 // indirect
85+
github.com/blevesearch/zapx/v16 v16.1.9-0.20241217210638-a0519e7caf3b // indirect
8686
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8787
github.com/containerd/log v0.1.0 // indirect
8888
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -126,7 +126,7 @@ require (
126126
github.com/prometheus/client_model v0.6.1 // indirect
127127
github.com/prometheus/common v0.55.0 // indirect
128128
github.com/prometheus/procfs v0.15.1 // indirect
129-
github.com/quic-go/quic-go v0.46.0 // indirect
129+
github.com/quic-go/quic-go v0.48.2 // indirect
130130
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
131131
github.com/rogpeppe/go-internal v1.13.1 // indirect
132132
github.com/rs/zerolog v1.29.1 // indirect
@@ -143,9 +143,9 @@ require (
143143
go.uber.org/mock v0.4.0 // indirect
144144
golang.org/x/mod v0.19.0 // indirect
145145
golang.org/x/net v0.33.0 // indirect
146-
golang.org/x/sys v0.28.0 // indirect
146+
golang.org/x/sys v0.29.0 // indirect
147147
golang.org/x/text v0.21.0 // indirect
148-
golang.org/x/time v0.8.0 // indirect
148+
golang.org/x/time v0.9.0 // indirect
149149
golang.org/x/tools v0.23.0 // indirect
150150
google.golang.org/protobuf v1.35.1 // indirect
151151
gopkg.in/macaroon.v2 v2.1.0 // indirect

0 commit comments

Comments
 (0)