Skip to content

Commit 745d2d7

Browse files
au2001au2001
authored
Merge pull request #1 from au2001-homelab/main
Update gh-pages branch
2 parents f4602fd + e546df2 commit 745d2d7

File tree

157 files changed

+2669
-1534
lines changed

Some content is hidden

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

157 files changed

+2669
-1534
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<!-- Please read https://matrix-org.github.io/dendrite/development/contributing before submitting your pull request -->
44

55
* [ ] I have added Go unit tests or [Complement integration tests](https://github.com/matrix-org/complement) for this PR _or_ I have justified why this PR doesn't need tests
6-
* [ ] Pull request includes a [sign off below using a legally identifiable name](https://matrix-org.github.io/dendrite/development/contributing#sign-off) _or_ I have already signed off privately
6+
* [ ] Pull request includes a [sign off below](https://element-hq.github.io/dendrite/development/contributing#sign-off) _or_ I have already signed off privately
77

88
Signed-off-by: `Your Name <your@email.example.org>`

‎.github/dependabot.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: gomod
4+
directory: /
5+
schedule:
6+
interval: weekly
7+
labels:
8+
- "dependencies"
9+
- "go"
10+
- package-ecosystem: "github-actions"
11+
directory: /
12+
schedule:
13+
interval: weekly

‎.github/workflows/dendrite.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
- uses: actions/checkout@v4
3232

3333
- name: Install Go
34-
uses: actions/setup-go@v4
34+
uses: actions/setup-go@v5
3535
with:
3636
go-version-file: "go.mod"
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

@@ -70,11 +70,11 @@ jobs:
7070
- name: Install libolm
7171
run: sudo apt-get install libolm-dev libolm3
7272
- name: Install Go
73-
uses: actions/setup-go@v4
73+
uses: actions/setup-go@v5
7474
with:
7575
go-version-file: "go.mod"
7676
- name: golangci-lint
77-
uses: golangci/golangci-lint-action@v3
77+
uses: golangci/golangci-lint-action@v6
7878

7979
# run go test with different go versions
8080
test:
@@ -106,7 +106,7 @@ jobs:
106106
- name: Install libolm
107107
run: sudo apt-get install libolm-dev libolm3
108108
- name: Setup go
109-
uses: actions/setup-go@v4
109+
uses: actions/setup-go@v5
110110
with:
111111
go-version-file: "go.mod"
112112
- uses: actions/cache@v4
@@ -143,7 +143,7 @@ jobs:
143143
steps:
144144
- uses: actions/checkout@v4
145145
- name: Setup go
146-
uses: actions/setup-go@v4
146+
uses: actions/setup-go@v5
147147
with:
148148
go-version-file: "go.mod"
149149
- uses: actions/cache@v4
@@ -176,7 +176,7 @@ jobs:
176176
steps:
177177
- uses: actions/checkout@v4
178178
- name: Setup Go
179-
uses: actions/setup-go@v4
179+
uses: actions/setup-go@v5
180180
with:
181181
go-version-file: "go.mod"
182182
- uses: actions/cache@v4
@@ -239,7 +239,7 @@ jobs:
239239
- name: Install libolm
240240
run: sudo apt-get install libolm-dev libolm3
241241
- name: Setup go
242-
uses: actions/setup-go@v4
242+
uses: actions/setup-go@v5
243243
with:
244244
go-version-file: "go.mod"
245245
- name: Set up gotestfmt
@@ -262,7 +262,7 @@ jobs:
262262
POSTGRES_PASSWORD: postgres
263263
POSTGRES_DB: dendrite
264264
- name: Upload coverage to Codecov
265-
uses: codecov/codecov-action@v4
265+
uses: codecov/codecov-action@v5
266266
with:
267267
flags: unittests
268268
fail_ci_if_error: true
@@ -277,7 +277,7 @@ jobs:
277277
steps:
278278
- uses: actions/checkout@v4
279279
- name: Setup go
280-
uses: actions/setup-go@v4
280+
uses: actions/setup-go@v5
281281
with:
282282
go-version-file: "go.mod"
283283
cache: true
@@ -294,9 +294,9 @@ jobs:
294294
- name: Build upgrade-tests
295295
run: go build ./cmd/dendrite-upgrade-tests
296296
- name: Test upgrade (PostgreSQL)
297-
run: ./dendrite-upgrade-tests --head .
297+
run: ./dendrite-upgrade-tests -repository=matrix-org/dendrite --head .
298298
- name: Test upgrade (SQLite)
299-
run: ./dendrite-upgrade-tests --sqlite --head .
299+
run: ./dendrite-upgrade-tests --sqlite -repository=matrix-org/dendrite --head .
300300

301301
# run database upgrade tests, skipping over one version
302302
upgrade_test_direct:
@@ -307,7 +307,7 @@ jobs:
307307
steps:
308308
- uses: actions/checkout@v4
309309
- name: Setup go
310-
uses: actions/setup-go@v4
310+
uses: actions/setup-go@v5
311311
with:
312312
go-version-file: "go.mod"
313313
cache: true
@@ -324,9 +324,9 @@ jobs:
324324
- name: Build upgrade-tests
325325
run: go build ./cmd/dendrite-upgrade-tests
326326
- name: Test upgrade (PostgreSQL)
327-
run: ./dendrite-upgrade-tests -direct -from HEAD-2 --head .
327+
run: ./dendrite-upgrade-tests -direct -from HEAD-2 -repository=matrix-org/dendrite --head .
328328
- name: Test upgrade (SQLite)
329-
run: ./dendrite-upgrade-tests -direct -from HEAD-2 --head .
329+
run: ./dendrite-upgrade-tests --sqlite -direct -from HEAD-2 -repository=matrix-org/dendrite --head .
330330

331331
# run Sytest in different variations
332332
sytest:

‎.github/workflows/docker.yml‎

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
env:
1515
DOCKER_NAMESPACE: matrixdotorg
1616
DOCKER_HUB_USER: dendritegithub
17-
GHCR_NAMESPACE: matrix-org
17+
GHCR_NAMESPACE: element-hq
1818
PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7
1919

2020
jobs:
@@ -48,13 +48,27 @@ jobs:
4848
username: ${{ github.repository_owner }}
4949
password: ${{ secrets.GITHUB_TOKEN }}
5050

51+
# Build until the "build" stage, this then can be used by other steps.
52+
- name: Build "build" image
53+
if: github.ref_name == 'main' || github.event_name == 'release'
54+
id: docker_build_cache
55+
uses: docker/build-push-action@v6
56+
with:
57+
target: build
58+
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
59+
cache-to: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache,mode=max
60+
context: .
61+
platforms: ${{ env.PLATFORMS }}
62+
push: true
63+
tags: |
64+
ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:binaries
65+
5166
- name: Build main monolith image
5267
if: github.ref_name == 'main'
5368
id: docker_build_monolith
54-
uses: docker/build-push-action@v3
69+
uses: docker/build-push-action@v6
5570
with:
5671
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
57-
cache-to: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache,mode=max
5872
context: .
5973
platforms: ${{ env.PLATFORMS }}
6074
push: true
@@ -65,10 +79,8 @@ jobs:
6579
- name: Build release monolith image
6680
if: github.event_name == 'release' # Only for GitHub releases
6781
id: docker_build_monolith_release
68-
uses: docker/build-push-action@v3
82+
uses: docker/build-push-action@v6
6983
with:
70-
cache-from: type=gha
71-
cache-to: type=gha,mode=max
7284
context: .
7385
platforms: ${{ env.PLATFORMS }}
7486
push: true
@@ -86,13 +98,14 @@ jobs:
8698
output: "trivy-results.sarif"
8799

88100
- name: Upload Trivy scan results to GitHub Security tab
89-
uses: github/codeql-action/upload-sarif@v2
101+
uses: github/codeql-action/upload-sarif@v3
90102
with:
91103
sarif_file: "trivy-results.sarif"
92104

93105
demo-pinecone:
94106
name: Pinecone demo image
95107
runs-on: ubuntu-latest
108+
needs: monolith
96109
permissions:
97110
contents: read
98111
packages: write
@@ -122,10 +135,9 @@ jobs:
122135
- name: Build main Pinecone demo image
123136
if: github.ref_name == 'main'
124137
id: docker_build_demo_pinecone
125-
uses: docker/build-push-action@v3
138+
uses: docker/build-push-action@v6
126139
with:
127-
cache-from: type=gha
128-
cache-to: type=gha,mode=max
140+
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
129141
context: .
130142
file: ./build/docker/Dockerfile.demo-pinecone
131143
platforms: ${{ env.PLATFORMS }}
@@ -137,23 +149,23 @@ jobs:
137149
- name: Build release Pinecone demo image
138150
if: github.event_name == 'release' # Only for GitHub releases
139151
id: docker_build_demo_pinecone_release
140-
uses: docker/build-push-action@v3
152+
uses: docker/build-push-action@v6
141153
with:
142-
cache-from: type=gha
143-
cache-to: type=gha,mode=max
154+
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
144155
context: .
145156
file: ./build/docker/Dockerfile.demo-pinecone
146157
platforms: ${{ env.PLATFORMS }}
147158
push: true
148159
tags: |
149-
${{ env.DOCKER_NAMESPACE }}/dendrite-demo-yggdrasil:latest
150-
${{ env.DOCKER_NAMESPACE }}/dendrite-demo-yggdrasil:${{ env.RELEASE_VERSION }}
151-
ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-demo-yggdrasil:latest
152-
ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-demo-yggdrasil:${{ env.RELEASE_VERSION }}
160+
${{ env.DOCKER_NAMESPACE }}/dendrite-demo-pinecone:latest
161+
${{ env.DOCKER_NAMESPACE }}/dendrite-demo-pinecone:${{ env.RELEASE_VERSION }}
162+
ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-demo-pinecone:latest
163+
ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-demo-pinecone:${{ env.RELEASE_VERSION }}
153164
154165
demo-yggdrasil:
155166
name: Yggdrasil demo image
156167
runs-on: ubuntu-latest
168+
needs: monolith
157169
permissions:
158170
contents: read
159171
packages: write
@@ -183,10 +195,9 @@ jobs:
183195
- name: Build main Yggdrasil demo image
184196
if: github.ref_name == 'main'
185197
id: docker_build_demo_yggdrasil
186-
uses: docker/build-push-action@v3
198+
uses: docker/build-push-action@v6
187199
with:
188-
cache-from: type=gha
189-
cache-to: type=gha,mode=max
200+
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
190201
context: .
191202
file: ./build/docker/Dockerfile.demo-yggdrasil
192203
platforms: ${{ env.PLATFORMS }}
@@ -198,10 +209,9 @@ jobs:
198209
- name: Build release Yggdrasil demo image
199210
if: github.event_name == 'release' # Only for GitHub releases
200211
id: docker_build_demo_yggdrasil_release
201-
uses: docker/build-push-action@v3
212+
uses: docker/build-push-action@v6
202213
with:
203-
cache-from: type=gha
204-
cache-to: type=gha,mode=max
214+
cache-from: type=registry,ref=ghcr.io/${{ env.GHCR_NAMESPACE }}/dendrite-monolith:buildcache
205215
context: .
206216
file: ./build/docker/Dockerfile.demo-yggdrasil
207217
platforms: ${{ env.PLATFORMS }}

‎.github/workflows/gh-pages.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ jobs:
3030
- name: Checkout
3131
uses: actions/checkout@v4
3232
- name: Setup Pages
33-
uses: actions/configure-pages@v2
33+
uses: actions/configure-pages@v5
3434
- name: Build with Jekyll
3535
uses: actions/jekyll-build-pages@v1
3636
with:
3737
source: ./docs
3838
destination: ./_site
3939
- name: Upload artifact
40-
uses: actions/upload-pages-artifact@v1
40+
uses: actions/upload-pages-artifact@v3
4141

4242
# Deployment job
4343
deploy:
@@ -49,4 +49,4 @@ jobs:
4949
steps:
5050
- name: Deploy to GitHub Pages
5151
id: deployment
52-
uses: actions/deploy-pages@v1
52+
uses: actions/deploy-pages@v4

‎.github/workflows/helm.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
2828
2929
- name: Install Helm
30-
uses: azure/setup-helm@v3
30+
uses: azure/setup-helm@v4
3131
with:
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
- uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
23-
- uses: azure/setup-helm@v3
23+
- uses: azure/setup-helm@v4
2424
with:
2525
version: v3.10.0
26-
- uses: actions/setup-python@v4
26+
- uses: actions/setup-python@v5
2727
with:
2828
python-version: 3.11
2929
check-latest: true
30-
- uses: helm/chart-testing-action@v2.3.1
30+
- uses: helm/chart-testing-action@v2.7.0
3131
- name: Get changed status
3232
id: list-changed
3333
run: |
@@ -53,16 +53,16 @@ jobs:
5353
fetch-depth: 0
5454
ref: ${{ inputs.checkoutCommit }}
5555
- name: Install Kubernetes tools
56-
uses: yokawasa/action-setup-kube-tools@v0.8.2
56+
uses: yokawasa/action-setup-kube-tools@v0.11.2
5757
with:
5858
setup-tools: |
5959
helmv3
6060
helm: "3.10.3"
61-
- uses: actions/setup-python@v4
61+
- uses: actions/setup-python@v5
6262
with:
6363
python-version: "3.10"
6464
- name: Set up chart-testing
65-
uses: helm/chart-testing-action@v2.3.1
65+
uses: helm/chart-testing-action@v2.7.0
6666
- name: Create k3d cluster
6767
uses: nolar/setup-k3d-k3s@v1
6868
with:

0 commit comments

Comments
 (0)