Skip to content

Commit a8cc12c

Browse files
fedmagfedmag
authored
Merge branch 'umputun:master' into premoderation
2 parents b3838b3 + aca0cff commit a8cc12c

File tree

129 files changed

+10178
-45613
lines changed

Some content is hidden

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

129 files changed

+10178
-45613
lines changed

‎.github/workflows/ci-backend.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ jobs:
6060
- name: golangci-lint
6161
uses: golangci/golangci-lint-action@v9
6262
with:
63-
version: "v2.6.0"
63+
version: "v2.10.1"
6464
working-directory: backend/app
6565

6666
- name: golangci-lint on example directory
6767
uses: golangci/golangci-lint-action@v9
6868
with:
69-
version: "v2.6.0"
69+
version: "v2.10.1"
7070
args: --config ../../.golangci.yml
7171
working-directory: backend/_example/memory_store
7272

‎.github/workflows/ci-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: docker/setup-buildx-action@v3
3232

3333
- name: expose GitHub Actions cache
34-
uses: actions/cache@v4
34+
uses: actions/cache@v5
3535
with:
3636
path: /tmp/.buildx-cache
3737
key: ${{ runner.os }}-buildx-${{ github.sha }}

‎.github/workflows/ci-frontend-api.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_ENV
4848

4949
- name: Setup pnpm cache
50-
uses: actions/cache@v4
50+
uses: actions/cache@v5
5151
with:
5252
path: ${{ env.pnpm_cache_dir }}
5353
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -94,7 +94,7 @@ jobs:
9494
run: echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_ENV
9595

9696
- name: Setup pnpm cache
97-
uses: actions/cache@v4
97+
uses: actions/cache@v5
9898
with:
9999
path: ${{ env.pnpm_cache_dir }}
100100
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -141,7 +141,7 @@ jobs:
141141
run: echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_ENV
142142

143143
- name: Setup pnpm cache
144-
uses: actions/cache@v4
144+
uses: actions/cache@v5
145145
with:
146146
path: ${{ env.pnpm_cache_dir }}
147147
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}

‎.github/workflows/ci-frontend.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_ENV
4848

4949
- name: Setup pnpm cache
50-
uses: actions/cache@v4
50+
uses: actions/cache@v5
5151
with:
5252
path: ${{ env.pnpm_cache_dir }}
5353
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -94,7 +94,7 @@ jobs:
9494
run: echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_ENV
9595

9696
- name: Setup pnpm cache
97-
uses: actions/cache@v4
97+
uses: actions/cache@v5
9898
with:
9999
path: ${{ env.pnpm_cache_dir }}
100100
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -141,7 +141,7 @@ jobs:
141141
run: echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_ENV
142142

143143
- name: Setup pnpm cache
144-
uses: actions/cache@v4
144+
uses: actions/cache@v5
145145
with:
146146
path: ${{ env.pnpm_cache_dir }}
147147
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -217,7 +217,7 @@ jobs:
217217
run: echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_ENV
218218

219219
- name: Setup pnpm cache
220-
uses: actions/cache@v4
220+
uses: actions/cache@v5
221221
with:
222222
path: ${{ env.pnpm_cache_dir }}
223223
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}

‎.github/workflows/ci-site.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
name: site
22

33
on:
4+
release:
5+
types: [published]
46
push:
57
branches:
68
- master
7-
tags:
89
paths:
910
- ".github/workflows/ci-site.yml"
1011
- "site/**"
@@ -69,7 +70,7 @@ jobs:
6970
touch "/tmp/digests/${digest#sha256:}"
7071
7172
- name: upload digest
72-
uses: actions/upload-artifact@v5
73+
uses: actions/upload-artifact@v6
7374
with:
7475
name: site-digests-${{ matrix.artifact }}
7576
path: /tmp/digests/*
@@ -85,7 +86,7 @@ jobs:
8586

8687
steps:
8788
- name: download digests
88-
uses: actions/download-artifact@v6
89+
uses: actions/download-artifact@v7
8990
with:
9091
path: /tmp/digests
9192
pattern: site-digests-*
@@ -133,7 +134,8 @@ jobs:
133134
name: Deploy site
134135
runs-on: ubuntu-latest
135136
needs: merge
136-
if: github.ref == 'refs/heads/master'
137+
if: github.ref == 'refs/heads/master' || github.event_name == 'release'
138+
permissions: {} # only calls an external URL via curl, no GitHub API access needed
137139

138140
steps:
139141
- name: trigger deployment

‎.github/workflows/docker.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ jobs:
104104
touch "/tmp/digests/dockerhub/${digest_dockerhub#sha256:}"
105105
106106
- name: upload ghcr digest
107-
uses: actions/upload-artifact@v5
107+
uses: actions/upload-artifact@v6
108108
with:
109109
name: digests-ghcr-${{ matrix.artifact }}
110110
path: /tmp/digests/ghcr/*
111111
retention-days: 1
112112

113113
- name: upload dockerhub digest
114-
uses: actions/upload-artifact@v5
114+
uses: actions/upload-artifact@v6
115115
with:
116116
name: digests-dockerhub-${{ matrix.artifact }}
117117
path: /tmp/digests/dockerhub/*
@@ -127,14 +127,14 @@ jobs:
127127

128128
steps:
129129
- name: download ghcr digests
130-
uses: actions/download-artifact@v6
130+
uses: actions/download-artifact@v7
131131
with:
132132
path: /tmp/digests/ghcr
133133
pattern: digests-ghcr-*
134134
merge-multiple: true
135135

136136
- name: download dockerhub digests
137-
uses: actions/download-artifact@v6
137+
uses: actions/download-artifact@v7
138138
with:
139139
path: /tmp/digests/dockerhub
140140
pattern: digests-dockerhub-*
@@ -206,6 +206,7 @@ jobs:
206206
runs-on: ubuntu-latest
207207
needs: merge
208208
if: github.event.workflow_run.head_branch == 'master'
209+
permissions: {} # only calls an external URL via curl, no GitHub API access needed
209210

210211
steps:
211212
- name: trigger deployment

‎.github/workflows/e2e-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
id: tests
3535
run: COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose -f compose-e2e-test.yml up --build --quiet-pull --exit-code-from tests
3636

37-
- uses: actions/upload-artifact@v5
37+
- uses: actions/upload-artifact@v6
3838
if: always()
3939
with:
4040
name: playwright-report

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@ compose-private.yml
2626
http-client.env.json
2727
/playwright-report/
2828
/backend/app/cmd/var
29+
30+
# ralphex progress logs
31+
.ralphex/progress/

‎backend/.golangci.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ linters:
2323
goconst:
2424
min-len: 2
2525
min-occurrences: 2
26+
gosec:
27+
excludes:
28+
- G117 # false positive: struct field name matches "secret" pattern
29+
- G703 # false positive: path traversal via taint analysis
30+
- G704 # false positive: SSRF via taint analysis
31+
- G705 # false positive: XSS via taint analysis
2632
gocritic:
2733
disabled-checks:
2834
- wrapperFunc
@@ -51,6 +57,9 @@ linters:
5157
- linters:
5258
- revive
5359
text: 'var-naming: avoid meaningless package names'
60+
- linters:
61+
- revive
62+
text: 'var-naming: avoid package names that conflict with Go standard library package names'
5463
- linters:
5564
- dupl
5665
- gosec

‎backend/_example/memory_store/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ require (
1313
require (
1414
github.com/Depado/bfchroma/v2 v2.0.0 // indirect
1515
github.com/PuerkitoBio/goquery v1.11.0 // indirect
16-
github.com/alecthomas/chroma/v2 v2.21.1 // indirect
16+
github.com/alecthomas/chroma/v2 v2.23.1 // indirect
1717
github.com/andybalholm/cascadia v1.3.3 // indirect
1818
github.com/aymerick/douceur v0.2.0 // indirect
1919
github.com/davecgh/go-spew v1.1.1 // indirect
2020
github.com/dlclark/regexp2 v1.11.5 // indirect
21-
github.com/go-pkgz/rest v1.20.6 // indirect
21+
github.com/go-pkgz/rest v1.21.0 // indirect
2222
github.com/go-pkgz/routegroup v1.6.0 // indirect
2323
github.com/gorilla/css v1.0.1 // indirect
2424
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -30,10 +30,10 @@ require (
3030
github.com/rs/xid v1.6.0 // indirect
3131
github.com/russross/blackfriday/v2 v2.1.0 // indirect
3232
go.etcd.io/bbolt v1.4.3 // indirect
33-
golang.org/x/crypto v0.46.0 // indirect
34-
golang.org/x/image v0.34.0 // indirect
35-
golang.org/x/net v0.48.0 // indirect
36-
golang.org/x/sys v0.39.0 // indirect
33+
golang.org/x/crypto v0.48.0 // indirect
34+
golang.org/x/image v0.36.0 // indirect
35+
golang.org/x/net v0.49.0 // indirect
36+
golang.org/x/sys v0.41.0 // indirect
3737
gopkg.in/yaml.v3 v3.0.1 // indirect
3838
)
3939

0 commit comments

Comments
 (0)