Skip to content

Commit c7b3bf3

Browse files
committed
Merge branch 'main' into lunny/catfile_batch_refactor
2 parents 2454ab6 + 0f66814 commit c7b3bf3

File tree

1,710 files changed

+40392
-39172
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,710 files changed

+40392
-39172
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-contrib/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: 0 additions & 1004 deletions
This file was deleted.

.github/labeler.yml

Lines changed: 12 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

@@ -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: 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: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,12 @@ 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"
38-
- uses: actions/setup-node@v4
35+
- uses: astral-sh/setup-uv@v6
36+
- run: uv python install 3.12
37+
- uses: pnpm/action-setup@v4
38+
- uses: actions/setup-node@v5
3939
with:
4040
node-version: 24
41-
cache: npm
42-
cache-dependency-path: package-lock.json
43-
- run: pip install poetry
4441
- run: make deps-py
4542
- run: make deps-frontend
4643
- run: make lint-templates
@@ -51,10 +48,8 @@ jobs:
5148
runs-on: ubuntu-latest
5249
steps:
5350
- uses: actions/checkout@v4
54-
- uses: actions/setup-python@v5
55-
with:
56-
python-version: "3.12"
57-
- run: pip install poetry
51+
- uses: astral-sh/setup-uv@v6
52+
- run: uv python install 3.12
5853
- run: make deps-py
5954
- run: make lint-yaml
6055

@@ -64,11 +59,10 @@ jobs:
6459
runs-on: ubuntu-latest
6560
steps:
6661
- uses: actions/checkout@v4
67-
- uses: actions/setup-node@v4
62+
- uses: pnpm/action-setup@v4
63+
- uses: actions/setup-node@v5
6864
with:
6965
node-version: 24
70-
cache: npm
71-
cache-dependency-path: package-lock.json
7266
- run: make deps-frontend
7367
- run: make lint-swagger
7468

@@ -135,11 +129,10 @@ jobs:
135129
runs-on: ubuntu-latest
136130
steps:
137131
- uses: actions/checkout@v4
138-
- uses: actions/setup-node@v4
132+
- uses: pnpm/action-setup@v4
133+
- uses: actions/setup-node@v5
139134
with:
140135
node-version: 24
141-
cache: npm
142-
cache-dependency-path: package-lock.json
143136
- run: make deps-frontend
144137
- run: make lint-frontend
145138
- run: make checks-frontend
@@ -184,11 +177,10 @@ jobs:
184177
runs-on: ubuntu-latest
185178
steps:
186179
- uses: actions/checkout@v4
187-
- uses: actions/setup-node@v4
180+
- uses: pnpm/action-setup@v4
181+
- uses: actions/setup-node@v5
188182
with:
189183
node-version: 24
190-
cache: npm
191-
cache-dependency-path: package-lock.json
192184
- run: make deps-frontend
193185
- run: make lint-md
194186

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

Lines changed: 6 additions & 6 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
@@ -72,13 +72,13 @@ jobs:
7272
go-version-file: go.mod
7373
check-latest: true
7474
- run: make deps-backend
75-
- run: make backend
75+
- run: GOEXPERIMENT='' make backend
7676
env:
7777
TAGS: bindata gogit sqlite sqlite_unlock_notify
7878
- name: run migration tests
7979
run: make test-sqlite-migration
8080
- name: run tests
81-
run: make test-sqlite
81+
run: GOEXPERIMENT='' make test-sqlite
8282
timeout-minutes: 50
8383
env:
8484
TAGS: bindata gogit sqlite sqlite_unlock_notify
@@ -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
@@ -142,7 +142,7 @@ jobs:
142142
RACE_ENABLED: true
143143
GITHUB_READ_TOKEN: ${{ secrets.GITHUB_READ_TOKEN }}
144144
- name: unit-tests-gogit
145-
run: make unit-test-coverage test-check
145+
run: GOEXPERIMENT='' make unit-test-coverage test-check
146146
env:
147147
TAGS: bindata gogit
148148
RACE_ENABLED: true
@@ -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: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@ jobs:
2323
with:
2424
go-version-file: go.mod
2525
check-latest: true
26-
- uses: actions/setup-node@v4
26+
- uses: pnpm/action-setup@v4
27+
- uses: actions/setup-node@v5
2728
with:
2829
node-version: 24
29-
cache: npm
30-
cache-dependency-path: package-lock.json
3130
- run: make deps-frontend frontend deps-backend
32-
- run: npx playwright install --with-deps
31+
- run: pnpm exec playwright install --with-deps
3332
- run: make test-e2e-sqlite
3433
timeout-minutes: 40
3534
env:

.github/workflows/release-nightly.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ jobs:
2020
with:
2121
go-version-file: go.mod
2222
check-latest: true
23-
- uses: actions/setup-node@v4
23+
- uses: pnpm/action-setup@v4
24+
- uses: actions/setup-node@v5
2425
with:
2526
node-version: 24
26-
cache: npm
27-
cache-dependency-path: package-lock.json
2827
- run: make deps-frontend deps-backend
2928
# xgo build
3029
- run: make release
@@ -75,11 +74,6 @@ jobs:
7574
- name: Get cleaned branch name
7675
id: clean_name
7776
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
8377
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
8478
echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
8579
- name: Login to Docker Hub
@@ -122,11 +116,6 @@ jobs:
122116
- name: Get cleaned branch name
123117
id: clean_name
124118
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
130119
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
131120
echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
132121
- name: Login to Docker Hub

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

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

0 commit comments

Comments
 (0)