Skip to content

Commit 6e7fc93

Browse files
Merge remote-tracking branch 'upstream/main' into Badge
2 parents 52957f4 + 86aafea commit 6e7fc93

File tree

1,560 files changed

+38940
-26232
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,560 files changed

+38940
-26232
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/jsburckhardt/devcontainer-features/uv:1": {},
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

.eslintrc.cjs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ module.exports = {
9191
plugins: ['@vitest/eslint-plugin'],
9292
globals: vitestPlugin.environments.env.globals,
9393
rules: {
94+
'github/unescaped-html-literal': [0],
9495
'@vitest/consistent-test-filename': [0],
9596
'@vitest/consistent-test-it': [0],
9697
'@vitest/expect-expect': [0],
@@ -325,6 +326,7 @@ module.exports = {
325326
'@typescript-eslint/no-unnecessary-type-arguments': [0],
326327
'@typescript-eslint/no-unnecessary-type-assertion': [2],
327328
'@typescript-eslint/no-unnecessary-type-constraint': [2],
329+
'@typescript-eslint/no-unnecessary-type-conversion': [2],
328330
'@typescript-eslint/no-unsafe-argument': [0],
329331
'@typescript-eslint/no-unsafe-assignment': [0],
330332
'@typescript-eslint/no-unsafe-call': [0],
@@ -423,7 +425,7 @@ module.exports = {
423425
'github/no-useless-passive': [2],
424426
'github/prefer-observers': [2],
425427
'github/require-passive-events': [2],
426-
'github/unescaped-html-literal': [0],
428+
'github/unescaped-html-literal': [2],
427429
'grouped-accessor-pairs': [2],
428430
'guard-for-in': [0],
429431
'id-blacklist': [0],
@@ -644,7 +646,7 @@ module.exports = {
644646
'no-multi-str': [2],
645647
'no-negated-condition': [0],
646648
'no-nested-ternary': [0],
647-
'no-new-func': [2],
649+
'no-new-func': [0], // handled by @typescript-eslint/no-implied-eval
648650
'no-new-native-nonconstructor': [2],
649651
'no-new-object': [2],
650652
'no-new-symbol': [2],

.github/labeler.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ modifies/dependencies:
6161
- "package.json"
6262
- "package-lock.json"
6363
- "pyproject.toml"
64-
- "poetry.lock"
64+
- "uv.lock"
6565
- "go.mod"
6666
- "go.sum"
6767

@@ -81,3 +81,13 @@ docs-update-needed:
8181
- changed-files:
8282
- any-glob-to-any-file:
8383
- "custom/conf/app.example.ini"
84+
85+
topic/code-linting:
86+
- changed-files:
87+
- any-glob-to-any-file:
88+
- ".eslintrc.cjs"
89+
- ".golangci.yml"
90+
- ".markdownlint.yaml"
91+
- ".spectral.yaml"
92+
- ".yamllint.yaml"
93+
- "stylelint.config.js"

.github/workflows/files-changed.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
- "tools/lint-templates-*.js"
7878
- "templates/**/*.tmpl"
7979
- "pyproject.toml"
80-
- "poetry.lock"
80+
- "uv.lock"
8181
8282
docker:
8383
- "Dockerfile"
@@ -98,4 +98,3 @@ jobs:
9898
- "**/*.yaml"
9999
- ".yamllint.yaml"
100100
- "pyproject.toml"
101-
- "poetry.lock"

.github/workflows/pull-compliance.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- uses: actions/checkout@v4
35-
- uses: actions/setup-python@v5
36-
with:
37-
python-version: "3.12"
35+
- uses: astral-sh/setup-uv@v6
36+
- run: uv python install 3.12
3837
- uses: actions/setup-node@v4
3938
with:
40-
node-version: 22
39+
node-version: 24
4140
cache: npm
4241
cache-dependency-path: package-lock.json
43-
- run: pip install poetry
4442
- run: make deps-py
4543
- run: make deps-frontend
4644
- run: make lint-templates
@@ -51,10 +49,8 @@ jobs:
5149
runs-on: ubuntu-latest
5250
steps:
5351
- uses: actions/checkout@v4
54-
- uses: actions/setup-python@v5
55-
with:
56-
python-version: "3.12"
57-
- run: pip install poetry
52+
- uses: astral-sh/setup-uv@v6
53+
- run: uv python install 3.12
5854
- run: make deps-py
5955
- run: make lint-yaml
6056

@@ -66,7 +62,7 @@ jobs:
6662
- uses: actions/checkout@v4
6763
- uses: actions/setup-node@v4
6864
with:
69-
node-version: 22
65+
node-version: 24
7066
cache: npm
7167
cache-dependency-path: package-lock.json
7268
- run: make deps-frontend
@@ -137,7 +133,7 @@ jobs:
137133
- uses: actions/checkout@v4
138134
- uses: actions/setup-node@v4
139135
with:
140-
node-version: 22
136+
node-version: 24
141137
cache: npm
142138
cache-dependency-path: package-lock.json
143139
- run: make deps-frontend
@@ -186,7 +182,7 @@ jobs:
186182
- uses: actions/checkout@v4
187183
- uses: actions/setup-node@v4
188184
with:
189-
node-version: 22
185+
node-version: 24
190186
cache: npm
191187
cache-dependency-path: package-lock.json
192188
- 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

0 commit comments

Comments
 (0)