Skip to content

Commit 9e26d8b

Browse files
lunnylunny
authored
Merge branch 'main' into feat/api-projects
2 parents c224fc9 + 87362b4 commit 9e26d8b

File tree

789 files changed

+23127
-26695
lines changed

Some content is hidden

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

789 files changed

+23127
-26695
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
{
22
"name": "Gitea DevContainer",
3-
"image": "mcr.microsoft.com/devcontainers/go:1.24-bookworm",
3+
"image": "mcr.microsoft.com/devcontainers/go:1.25-trixie",
4+
"containerEnv": {
5+
// override "local" from packaged version
6+
"GOTOOLCHAIN": "auto"
7+
},
48
"features": {
59
// installs nodejs into container
610
"ghcr.io/devcontainers/features/node:1": {
7-
"version": "lts"
11+
"version": "latest"
812
},
9-
"ghcr.io/devcontainers/features/git-lfs:1.2.2": {},
10-
"ghcr.io/devcontainers-extra/features/poetry:2": {},
13+
"ghcr.io/devcontainers/features/git-lfs:1.2.5": {},
14+
"ghcr.io/jsburckhardt/devcontainer-features/uv:1": {},
1115
"ghcr.io/devcontainers/features/python:1": {
12-
"version": "3.12"
16+
"version": "3.13"
1317
},
1418
"ghcr.io/warrenbuckley/codespace-features/sqlite:1": {}
1519
},

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ cpu.out
6565
/yarn.lock
6666
/yarn-error.log
6767
/npm-debug.log*
68+
/pnpm-debug.log*
6869
/public/assets/js
6970
/public/assets/css
7071
/public/assets/fonts

‎.eslintrc.cjs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ module.exports = {
484484
'max-nested-callbacks': [0],
485485
'max-params': [0],
486486
'max-statements': [0],
487-
'multiline-comment-style': [2, 'separate-lines'],
487+
'multiline-comment-style': [0],
488488
'new-cap': [0],
489489
'no-alert': [0],
490490
'no-array-constructor': [0], // handled by @typescript-eslint/no-array-constructor
@@ -831,7 +831,6 @@ module.exports = {
831831
'sonarjs/no-inverted-boolean-check': [2],
832832
'sonarjs/no-nested-switch': [0],
833833
'sonarjs/no-nested-template-literals': [0],
834-
'sonarjs/no-one-iteration-loop': [2],
835834
'sonarjs/no-redundant-boolean': [2],
836835
'sonarjs/no-redundant-jump': [2],
837836
'sonarjs/no-same-line-conditional': [2],

‎.github/labeler.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ modifies/dependencies:
5959
- changed-files:
6060
- any-glob-to-any-file:
6161
- "package.json"
62-
- "package-lock.json"
62+
- "pnpm-lock.yaml"
6363
- "pyproject.toml"
64-
- "poetry.lock"
64+
- "uv.lock"
6565
- "go.mod"
6666
- "go.sum"
6767

‎.github/workflows/files-changed.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- "tools/*.ts"
5959
- "assets/emoji.json"
6060
- "package.json"
61-
- "package-lock.json"
61+
- "pnpm-lock.yaml"
6262
- "Makefile"
6363
- ".eslintrc.cjs"
6464
- ".npmrc"
@@ -67,7 +67,7 @@ jobs:
6767
- "**/*.md"
6868
- ".markdownlint.yaml"
6969
- "package.json"
70-
- "package-lock.json"
70+
- "pnpm-lock.yaml"
7171
7272
actions:
7373
- ".github/workflows/*"
@@ -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"
@@ -90,12 +90,11 @@ jobs:
9090
- "templates/swagger/v1_input.json"
9191
- "Makefile"
9292
- "package.json"
93-
- "package-lock.json"
93+
- "pnpm-lock.yaml"
9494
- ".spectral.yaml"
9595
9696
yaml:
9797
- "**/*.yml"
9898
- "**/*.yaml"
9999
- ".yamllint.yaml"
100100
- "pyproject.toml"
101-
- "poetry.lock"

‎.github/workflows/pull-compliance.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,14 @@ 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
37+
- uses: pnpm/action-setup@v4
3838
- uses: actions/setup-node@v4
3939
with:
4040
node-version: 24
41-
cache: npm
42-
cache-dependency-path: package-lock.json
43-
- run: pip install poetry
41+
cache: pnpm
42+
cache-dependency-path: pnpm-lock.yaml
4443
- run: make deps-py
4544
- run: make deps-frontend
4645
- run: make lint-templates
@@ -51,10 +50,8 @@ jobs:
5150
runs-on: ubuntu-latest
5251
steps:
5352
- uses: actions/checkout@v4
54-
- uses: actions/setup-python@v5
55-
with:
56-
python-version: "3.12"
57-
- run: pip install poetry
53+
- uses: astral-sh/setup-uv@v6
54+
- run: uv python install 3.12
5855
- run: make deps-py
5956
- run: make lint-yaml
6057

@@ -64,11 +61,12 @@ jobs:
6461
runs-on: ubuntu-latest
6562
steps:
6663
- uses: actions/checkout@v4
64+
- uses: pnpm/action-setup@v4
6765
- uses: actions/setup-node@v4
6866
with:
6967
node-version: 24
70-
cache: npm
71-
cache-dependency-path: package-lock.json
68+
cache: pnpm
69+
cache-dependency-path: pnpm-lock.yaml
7270
- run: make deps-frontend
7371
- run: make lint-swagger
7472

@@ -135,11 +133,12 @@ jobs:
135133
runs-on: ubuntu-latest
136134
steps:
137135
- uses: actions/checkout@v4
136+
- uses: pnpm/action-setup@v4
138137
- uses: actions/setup-node@v4
139138
with:
140139
node-version: 24
141-
cache: npm
142-
cache-dependency-path: package-lock.json
140+
cache: pnpm
141+
cache-dependency-path: pnpm-lock.yaml
143142
- run: make deps-frontend
144143
- run: make lint-frontend
145144
- run: make checks-frontend
@@ -184,11 +183,12 @@ jobs:
184183
runs-on: ubuntu-latest
185184
steps:
186185
- uses: actions/checkout@v4
186+
- uses: pnpm/action-setup@v4
187187
- uses: actions/setup-node@v4
188188
with:
189189
node-version: 24
190-
cache: npm
191-
cache-dependency-path: package-lock.json
190+
cache: pnpm
191+
cache-dependency-path: pnpm-lock.yaml
192192
- run: make deps-frontend
193193
- run: make lint-md
194194

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
minio:
3232
# as github actions doesn't support "entrypoint", we need to use a non-official image
3333
# that has a custom entrypoint set to "minio server /data"
34-
image: bitnami/minio:2023.8.31
34+
image: bitnamilegacy/minio:2023.8.31
3535
env:
3636
MINIO_ROOT_USER: 123456
3737
MINIO_ROOT_PASSWORD: 12345678
@@ -113,7 +113,7 @@ jobs:
113113
ports:
114114
- 6379:6379
115115
minio:
116-
image: bitnami/minio:2021.3.17
116+
image: bitnamilegacy/minio:2021.3.17
117117
env:
118118
MINIO_ACCESS_KEY: 123456
119119
MINIO_SECRET_KEY: 12345678
@@ -155,7 +155,7 @@ jobs:
155155
services:
156156
mysql:
157157
# the bitnami mysql image has more options than the official one, it's easier to customize
158-
image: bitnami/mysql:8.0
158+
image: bitnamilegacy/mysql:8.0
159159
env:
160160
ALLOW_EMPTY_PASSWORD: true
161161
MYSQL_DATABASE: testgitea

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ jobs:
2323
with:
2424
go-version-file: go.mod
2525
check-latest: true
26+
- uses: pnpm/action-setup@v4
2627
- uses: actions/setup-node@v4
2728
with:
2829
node-version: 24
29-
cache: npm
30-
cache-dependency-path: package-lock.json
30+
cache: pnpm
31+
cache-dependency-path: pnpm-lock.yaml
3132
- run: make deps-frontend frontend deps-backend
32-
- run: npx playwright install --with-deps
33+
- run: pnpm exec playwright install --with-deps
3334
- run: make test-e2e-sqlite
3435
timeout-minutes: 40
3536
env:

‎.github/workflows/release-nightly.yml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ jobs:
2020
with:
2121
go-version-file: go.mod
2222
check-latest: true
23+
- uses: pnpm/action-setup@v4
2324
- uses: actions/setup-node@v4
2425
with:
2526
node-version: 24
26-
cache: npm
27-
cache-dependency-path: package-lock.json
27+
cache: pnpm
28+
cache-dependency-path: pnpm-lock.yaml
2829
- run: make deps-frontend deps-backend
2930
# xgo build
3031
- run: make release
@@ -75,11 +76,6 @@ jobs:
7576
- name: Get cleaned branch name
7677
id: clean_name
7778
run: |
78-
# if main then say nightly otherwise cleanup name
79-
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
80-
echo "branch=nightly" >> "$GITHUB_OUTPUT"
81-
exit 0
82-
fi
8379
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
8480
echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
8581
- name: Login to Docker Hub
@@ -122,11 +118,6 @@ jobs:
122118
- name: Get cleaned branch name
123119
id: clean_name
124120
run: |
125-
# if main then say nightly otherwise cleanup name
126-
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
127-
echo "branch=nightly" >> "$GITHUB_OUTPUT"
128-
exit 0
129-
fi
130121
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
131122
echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
132123
- name: Login to Docker Hub

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ jobs:
2121
with:
2222
go-version-file: go.mod
2323
check-latest: true
24+
- uses: pnpm/action-setup@v4
2425
- uses: actions/setup-node@v4
2526
with:
2627
node-version: 24
27-
cache: npm
28-
cache-dependency-path: package-lock.json
28+
cache: pnpm
29+
cache-dependency-path: pnpm-lock.yaml
2930
- run: make deps-frontend deps-backend
3031
# xgo build
3132
- run: make release

0 commit comments

Comments
 (0)