Skip to content

Commit db1500c

Browse files
committed
Merge branch 'main' into push-secret-protection
2 parents 86dacce + 10cf202 commit db1500c

File tree

1,339 files changed

+33429
-21528
lines changed

Some content is hidden

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

1,339 files changed

+33429
-21528
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"features": {
55
// installs nodejs into container
66
"ghcr.io/devcontainers/features/node:1": {
7-
"version": "20"
7+
"version": "lts"
88
},
99
"ghcr.io/devcontainers/features/git-lfs:1.2.2": {},
10-
"ghcr.io/devcontainers-contrib/features/poetry:2": {},
10+
"ghcr.io/devcontainers-extra/features/poetry:2": {},
1111
"ghcr.io/devcontainers/features/python:1": {
1212
"version": "3.12"
1313
},

.dockerignore

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,6 @@ _testmain.go
3636
coverage.all
3737
cpu.out
3838

39-
/modules/migration/bindata.go
40-
/modules/migration/bindata.go.hash
41-
/modules/options/bindata.go
42-
/modules/options/bindata.go.hash
43-
/modules/public/bindata.go
44-
/modules/public/bindata.go.hash
45-
/modules/templates/bindata.go
46-
/modules/templates/bindata.go.hash
47-
4839
*.db
4940
*.log
5041

.github/workflows/pull-compliance.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
python-version: "3.12"
3838
- uses: actions/setup-node@v4
3939
with:
40-
node-version: 22
40+
node-version: 24
4141
cache: npm
4242
cache-dependency-path: package-lock.json
4343
- run: pip install poetry
@@ -66,7 +66,7 @@ jobs:
6666
- uses: actions/checkout@v4
6767
- uses: actions/setup-node@v4
6868
with:
69-
node-version: 22
69+
node-version: 24
7070
cache: npm
7171
cache-dependency-path: package-lock.json
7272
- run: make deps-frontend
@@ -137,7 +137,7 @@ jobs:
137137
- uses: actions/checkout@v4
138138
- uses: actions/setup-node@v4
139139
with:
140-
node-version: 22
140+
node-version: 24
141141
cache: npm
142142
cache-dependency-path: package-lock.json
143143
- run: make deps-frontend
@@ -186,7 +186,7 @@ jobs:
186186
- uses: actions/checkout@v4
187187
- uses: actions/setup-node@v4
188188
with:
189-
node-version: 22
189+
node-version: 24
190190
cache: npm
191191
cache-dependency-path: package-lock.json
192192
- run: make deps-frontend

.github/workflows/pull-db-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
services:
1919
pgsql:
20-
image: postgres:12
20+
image: postgres:14
2121
env:
2222
POSTGRES_DB: test
2323
POSTGRES_PASSWORD: postgres

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ jobs:
1212
uses: ./.github/workflows/files-changed.yml
1313

1414
test-e2e:
15-
if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' || needs.files-changed.outputs.actions == 'true'
15+
# the "test-e2e" won't pass, and it seems that there is no useful test, so skip
16+
# if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' || needs.files-changed.outputs.actions == 'true'
17+
if: false
1618
needs: files-changed
1719
runs-on: ubuntu-latest
1820
steps:
@@ -23,7 +25,7 @@ jobs:
2325
check-latest: true
2426
- uses: actions/setup-node@v4
2527
with:
26-
node-version: 22
28+
node-version: 24
2729
cache: npm
2830
cache-dependency-path: package-lock.json
2931
- run: make deps-frontend frontend deps-backend

.github/workflows/release-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
check-latest: true
2323
- uses: actions/setup-node@v4
2424
with:
25-
node-version: 22
25+
node-version: 24
2626
cache: npm
2727
cache-dependency-path: package-lock.json
2828
- run: make deps-frontend deps-backend

.github/workflows/release-tag-rc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
check-latest: true
2424
- uses: actions/setup-node@v4
2525
with:
26-
node-version: 22
26+
node-version: 24
2727
cache: npm
2828
cache-dependency-path: package-lock.json
2929
- run: make deps-frontend deps-backend

.github/workflows/release-tag-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
check-latest: true
2828
- uses: actions/setup-node@v4
2929
with:
30-
node-version: 22
30+
node-version: 24
3131
cache: npm
3232
cache-dependency-path: package-lock.json
3333
- run: make deps-frontend deps-backend

.gitignore

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ _test
2222
.vscode
2323
__debug_bin*
2424

25+
# Visual Studio
26+
/.vs/
27+
2528
*.cgo1.go
2629
*.cgo2.c
2730
_cgo_defun.c
@@ -39,14 +42,10 @@ _testmain.go
3942
coverage.all
4043
cpu.out
4144

42-
/modules/migration/bindata.go
43-
/modules/migration/bindata.go.hash
44-
/modules/options/bindata.go
45-
/modules/options/bindata.go.hash
46-
/modules/public/bindata.go
47-
/modules/public/bindata.go.hash
48-
/modules/templates/bindata.go
49-
/modules/templates/bindata.go.hash
45+
/modules/migration/bindata.*
46+
/modules/options/bindata.*
47+
/modules/public/bindata.*
48+
/modules/templates/bindata.*
5049

5150
*.db
5251
*.log

.golangci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ linters:
4545
desc: do not use the ini package, use gitea's config system instead
4646
- pkg: gitea.com/go-chi/cache
4747
desc: do not use the go-chi cache package, use gitea's cache system
48+
nolintlint:
49+
allow-unused: false
50+
require-explanation: true
51+
require-specific: true
4852
gocritic:
4953
disabled-checks:
5054
- ifElseChain
@@ -83,6 +87,10 @@ linters:
8387
- name: unreachable-code
8488
- name: var-declaration
8589
- name: var-naming
90+
arguments:
91+
- [] # AllowList - do not remove as args for the rule are positional and won't work without lists first
92+
- [] # DenyList
93+
- - skip-package-name-checks: true # supress errors from underscore in migration packages
8694
staticcheck:
8795
checks:
8896
- all

0 commit comments

Comments
 (0)