Skip to content

Commit ba3a9b6

Browse files
committed
Merge branch 'main' into mainzjj
* main: chore(deps): bump tool deps and pin, update `golangci-lint` (go-gitea#37574) build: update pnpm to v11 (go-gitea#37591) chore(renovate): detect Makefile tools, enable `go` bumps (go-gitea#37595) refactor: only reset a database table when the table's data was changed (go-gitea#37573) refactor: lint bare `fill`/`stroke` colors, add vars for git graph color series (go-gitea#37543) fix(actions): report individual step status in workflow job API response (go-gitea#37592) ci: allow `chore` type in PR title lint (go-gitea#37575) refactor: remove obsolete export (go-gitea#37579) fix: Invalid UTF-8 commit messages in JSON API responses (go-gitea#37542) fix: use consistent GetUser family functions (go-gitea#37553) fix(api): return 409 message instead of empty JSON for wrong commit id (go-gitea#37572) fix(actions): prevent panic when workflow contains null jobs (go-gitea#37570) [skip ci] Updated translations via Crowdin refactor: use modernc sqlite driver as default (go-gitea#37562) refactor(templates): remove ctxData from tmpl files, use ctx.RootData instead (go-gitea#37567) ci: increase renovate frequency and fix RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS (go-gitea#37565) # Conflicts: # models/user/user.go
2 parents f77e96e + 82d4029 commit ba3a9b6

224 files changed

Lines changed: 1043 additions & 851 deletions

File tree

Some content is hidden

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

.github/workflows/cache-seeder.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,17 @@ jobs:
4545
cache-name: seed
4646
- run: make deps-backend
4747
- run: TAGS="bindata" make backend
48-
- run: TAGS="bindata sqlite sqlite_unlock_notify" make backend
49-
- run: TAGS="bindata gogit sqlite sqlite_unlock_notify" GOEXPERIMENT="" make backend
48+
- run: TAGS="bindata gogit" GOEXPERIMENT="" make backend
5049

5150
lint:
5251
runs-on: ubuntu-latest
5352
strategy:
5453
fail-fast: false
5554
matrix:
5655
include:
57-
- { job: lint-backend, tags: "bindata sqlite sqlite_unlock_notify", target: "lint-backend" }
58-
- { job: lint-go-windows, tags: "bindata sqlite sqlite_unlock_notify", target: "lint-go-windows" }
59-
- { job: lint-go-gogit, tags: "bindata gogit sqlite sqlite_unlock_notify", target: "lint-go" }
56+
- { job: lint-backend, tags: "bindata", target: "lint-backend" }
57+
- { job: lint-go-windows, tags: "bindata", target: "lint-go-windows" }
58+
- { job: lint-go-gogit, tags: "bindata gogit", target: "lint-go" }
6059
steps:
6160
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6261
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0

.github/workflows/cron-renovate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: cron-renovate
22

33
on:
44
schedule:
5-
- cron: "0 1 * * *" # daily at 01:00 UTC
5+
- cron: "23 * * * *" # hourly at :23
66
workflow_dispatch:
77

88
concurrency:
@@ -28,5 +28,5 @@ jobs:
2828
token: ${{ secrets.RENOVATE_TOKEN }}
2929
env:
3030
RENOVATE_BINARY_SOURCE: install # auto-install go/node toolchains needed by post-upgrade tasks.
31-
RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^make (tidy|svg)$"]'
31+
RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '["^make (tidy|svg nolyfill)$"]'
3232
RENOVATE_REPOSITORIES: '["go-gitea/gitea"]'

.github/workflows/files-changed.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ jobs:
7171
- "assets/emoji.json"
7272
- "package.json"
7373
- "pnpm-lock.yaml"
74+
- "pnpm-workspace.yaml"
7475
- "Makefile"
75-
- ".eslintrc.cjs"
76-
- ".npmrc"
7776
7877
docs:
7978
- "**/*.md"
8079
- ".markdownlint.yaml"
8180
- "package.json"
8281
- "pnpm-lock.yaml"
82+
- "pnpm-workspace.yaml"
8383
8484
actions:
8585
- ".github/workflows/*"
@@ -108,6 +108,7 @@ jobs:
108108
- "Makefile"
109109
- "package.json"
110110
- "pnpm-lock.yaml"
111+
- "pnpm-workspace.yaml"
111112
- ".spectral.yaml"
112113
113114
yaml:

.github/workflows/pull-compliance.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- run: make deps-backend deps-tools
3333
- run: make lint-backend
3434
env:
35-
TAGS: bindata sqlite sqlite_unlock_notify
35+
TAGS: bindata
3636

3737
lint-on-demand:
3838
needs: files-changed
@@ -44,7 +44,7 @@ jobs:
4444
go-version-file: go.mod
4545
check-latest: true
4646
cache: false
47-
- uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
47+
- uses: pnpm/action-setup@8912a9102ac27614460f54aedde9e1e7f9aec20d # v6.0.5
4848
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
4949
with:
5050
node-version: 24
@@ -82,7 +82,7 @@ jobs:
8282
- run: make deps-backend deps-tools
8383
- run: make lint-go-windows
8484
env:
85-
TAGS: bindata sqlite sqlite_unlock_notify
85+
TAGS: bindata
8686
GOOS: windows
8787
GOARCH: amd64
8888

@@ -104,7 +104,7 @@ jobs:
104104
- run: make deps-backend deps-tools
105105
- run: make lint-go
106106
env:
107-
TAGS: bindata gogit sqlite sqlite_unlock_notify
107+
TAGS: bindata gogit
108108

109109
checks-backend:
110110
if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true'
@@ -130,7 +130,7 @@ jobs:
130130
runs-on: ubuntu-latest
131131
steps:
132132
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
133-
- uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
133+
- uses: pnpm/action-setup@8912a9102ac27614460f54aedde9e1e7f9aec20d # v6.0.5
134134
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
135135
with:
136136
node-version: 24

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ jobs:
6262
run: GITEA_TEST_DATABASE=pgsql make test-integration
6363
timeout-minutes: 50
6464
env:
65+
# pgsql is chosen to be the unlucky one to run with the slow "race detector", it is about 60% slower.
66+
GOTEST_FLAGS: -race -timeout=40m
6567
TAGS: bindata gogit
6668
TEST_LDAP: 1
6769

@@ -82,7 +84,7 @@ jobs:
8284
- run: make deps-backend
8385
- run: make backend
8486
env:
85-
TAGS: bindata gogit sqlite sqlite_unlock_notify
87+
TAGS: bindata gogit
8688
GOEXPERIMENT:
8789
- name: run migration tests
8890
run: GITEA_TEST_DATABASE=sqlite make test-migration
@@ -92,9 +94,10 @@ jobs:
9294
run: GITEA_TEST_DATABASE=sqlite make test-integration
9395
timeout-minutes: 50
9496
env:
97+
# sqlite driver can contain large amount of Golang code, so don't use race detector for it, otherwise, extremely slow
98+
GOTEST_FLAGS: -timeout=40m
9599
TAGS: bindata gogit
96100
GOEXPERIMENT:
97-
GOTEST_FLAGS: -race -timeout=40m
98101

99102
test-unit:
100103
if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true'
@@ -154,15 +157,15 @@ jobs:
154157
- name: unit-tests
155158
run: make test-backend test-check
156159
env:
157-
TAGS: bindata sqlite sqlite_unlock_notify
158160
GOTEST_FLAGS: -race -timeout=20m
161+
TAGS: bindata
159162
GITHUB_READ_TOKEN: ${{ secrets.GITHUB_READ_TOKEN }}
160163
- name: unit-tests-gogit
161164
run: make test-backend test-check
162165
env:
163-
TAGS: bindata gogit sqlite sqlite_unlock_notify
164-
GOEXPERIMENT:
165166
GOTEST_FLAGS: -race -timeout=20m
167+
TAGS: bindata gogit
168+
GOEXPERIMENT:
166169
GITHUB_READ_TOKEN: ${{ secrets.GITHUB_READ_TOKEN }}
167170

168171
test-mysql:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
cache-name: e2e
3131
build-cache: "false"
32-
- uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
32+
- uses: pnpm/action-setup@8912a9102ac27614460f54aedde9e1e7f9aec20d # v6.0.5
3333
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
3434
with:
3535
node-version: 24
@@ -40,11 +40,11 @@ jobs:
4040
- run: make deps-backend
4141
- run: make backend
4242
env:
43-
TAGS: bindata sqlite sqlite_unlock_notify
43+
TAGS: bindata
4444
- run: make playwright
4545
- run: make test-e2e
4646
timeout-minutes: 10
4747
env:
48-
TAGS: bindata sqlite sqlite_unlock_notify
48+
TAGS: bindata
4949
FORCE_COLOR: 1
5050
GITEA_TEST_E2E_DEBUG: 1

.github/workflows/release-nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
go-version-file: go.mod
2424
check-latest: true
25-
- uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
25+
- uses: pnpm/action-setup@8912a9102ac27614460f54aedde9e1e7f9aec20d # v6.0.5
2626
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2727
with:
2828
node-version: 24
@@ -32,7 +32,7 @@ jobs:
3232
# xgo build
3333
- run: make release
3434
env:
35-
TAGS: bindata sqlite sqlite_unlock_notify
35+
TAGS: bindata
3636
- name: import gpg key
3737
id: import_gpg
3838
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7.0.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
go-version-file: go.mod
2525
check-latest: true
26-
- uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
26+
- uses: pnpm/action-setup@8912a9102ac27614460f54aedde9e1e7f9aec20d # v6.0.5
2727
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2828
with:
2929
node-version: 24
@@ -33,7 +33,7 @@ jobs:
3333
# xgo build
3434
- run: make release
3535
env:
36-
TAGS: bindata sqlite sqlite_unlock_notify
36+
TAGS: bindata
3737
- name: import gpg key
3838
id: import_gpg
3939
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7.0.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
go-version-file: go.mod
2828
check-latest: true
29-
- uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
29+
- uses: pnpm/action-setup@8912a9102ac27614460f54aedde9e1e7f9aec20d # v6.0.5
3030
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
3131
with:
3232
node-version: 24
@@ -36,7 +36,7 @@ jobs:
3636
# xgo build
3737
- run: make release
3838
env:
39-
TAGS: bindata sqlite sqlite_unlock_notify
39+
TAGS: bindata
4040
- name: import gpg key
4141
id: import_gpg
4242
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7.0.0

.npmrc

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)