Skip to content

Commit 927fcfa

Browse files
committed
Merge branch 'main' into lunny/refactor_review_request
2 parents be34352 + 198f37e commit 927fcfa

File tree

272 files changed

+4476
-3663
lines changed

Some content is hidden

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

272 files changed

+4476
-3663
lines changed

.eslintrc.cjs

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

.github/workflows/pull-compliance.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ jobs:
3535
- uses: astral-sh/setup-uv@v6
3636
- run: uv python install 3.12
3737
- uses: pnpm/action-setup@v4
38-
- uses: actions/setup-node@v4
38+
- uses: actions/setup-node@v5
3939
with:
4040
node-version: 24
41-
cache: pnpm
42-
cache-dependency-path: pnpm-lock.yaml
4341
- run: make deps-py
4442
- run: make deps-frontend
4543
- run: make lint-templates
@@ -62,11 +60,9 @@ jobs:
6260
steps:
6361
- uses: actions/checkout@v4
6462
- uses: pnpm/action-setup@v4
65-
- uses: actions/setup-node@v4
63+
- uses: actions/setup-node@v5
6664
with:
6765
node-version: 24
68-
cache: pnpm
69-
cache-dependency-path: pnpm-lock.yaml
7066
- run: make deps-frontend
7167
- run: make lint-swagger
7268

@@ -134,11 +130,9 @@ jobs:
134130
steps:
135131
- uses: actions/checkout@v4
136132
- uses: pnpm/action-setup@v4
137-
- uses: actions/setup-node@v4
133+
- uses: actions/setup-node@v5
138134
with:
139135
node-version: 24
140-
cache: pnpm
141-
cache-dependency-path: pnpm-lock.yaml
142136
- run: make deps-frontend
143137
- run: make lint-frontend
144138
- run: make checks-frontend
@@ -184,11 +178,9 @@ jobs:
184178
steps:
185179
- uses: actions/checkout@v4
186180
- uses: pnpm/action-setup@v4
187-
- uses: actions/setup-node@v4
181+
- uses: actions/setup-node@v5
188182
with:
189183
node-version: 24
190-
cache: pnpm
191-
cache-dependency-path: pnpm-lock.yaml
192184
- run: make deps-frontend
193185
- run: make lint-md
194186

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ jobs:
2424
go-version-file: go.mod
2525
check-latest: true
2626
- uses: pnpm/action-setup@v4
27-
- uses: actions/setup-node@v4
27+
- uses: actions/setup-node@v5
2828
with:
2929
node-version: 24
30-
cache: pnpm
31-
cache-dependency-path: pnpm-lock.yaml
3230
- run: make deps-frontend frontend deps-backend
3331
- run: pnpm exec playwright install --with-deps
3432
- run: make test-e2e-sqlite

.github/workflows/release-nightly.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ jobs:
2121
go-version-file: go.mod
2222
check-latest: true
2323
- uses: pnpm/action-setup@v4
24-
- uses: actions/setup-node@v4
24+
- uses: actions/setup-node@v5
2525
with:
2626
node-version: 24
27-
cache: pnpm
28-
cache-dependency-path: pnpm-lock.yaml
2927
- run: make deps-frontend deps-backend
3028
# xgo build
3129
- run: make release

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ jobs:
2222
go-version-file: go.mod
2323
check-latest: true
2424
- uses: pnpm/action-setup@v4
25-
- uses: actions/setup-node@v4
25+
- uses: actions/setup-node@v5
2626
with:
2727
node-version: 24
28-
cache: pnpm
29-
cache-dependency-path: pnpm-lock.yaml
3028
- run: make deps-frontend deps-backend
3129
# xgo build
3230
- run: make release

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ jobs:
2626
go-version-file: go.mod
2727
check-latest: true
2828
- uses: pnpm/action-setup@v4
29-
- uses: actions/setup-node@v4
29+
- uses: actions/setup-node@v5
3030
with:
3131
node-version: 24
32-
cache: pnpm
33-
cache-dependency-path: pnpm-lock.yaml
3432
- run: make deps-frontend deps-backend
3533
# xgo build
3634
- run: make release

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(DIST)
162162
GO_DIRS := build cmd models modules routers services tests
163163
WEB_DIRS := web_src/js web_src/css
164164

165-
ESLINT_FILES := web_src/js tools *.ts *.cjs tests/e2e
165+
ESLINT_FILES := web_src/js tools *.ts tests/e2e
166166
STYLELINT_FILES := web_src/css web_src/js/components/*.vue
167167
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.md *.yml *.yaml *.toml)) $(filter-out tools/misspellings.csv, $(wildcard tools/*))
168168
EDITORCONFIG_FILES := templates .github/workflows options/locale/locale_en-US.ini
@@ -346,12 +346,12 @@ lint-backend-fix: lint-go-fix lint-go-gitea-vet lint-editorconfig ## lint backen
346346

347347
.PHONY: lint-js
348348
lint-js: node_modules ## lint js files
349-
$(NODE_VARS) pnpm exec eslint --color --max-warnings=0 --ext js,ts,vue $(ESLINT_FILES)
349+
$(NODE_VARS) pnpm exec eslint --color --max-warnings=0 --flag unstable_native_nodejs_ts_config $(ESLINT_FILES)
350350
$(NODE_VARS) pnpm exec vue-tsc
351351

352352
.PHONY: lint-js-fix
353353
lint-js-fix: node_modules ## lint js files and fix issues
354-
$(NODE_VARS) pnpm exec eslint --color --max-warnings=0 --ext js,ts,vue $(ESLINT_FILES) --fix
354+
$(NODE_VARS) pnpm exec eslint --color --max-warnings=0 --flag unstable_native_nodejs_ts_config $(ESLINT_FILES) --fix
355355
$(NODE_VARS) pnpm exec vue-tsc
356356

357357
.PHONY: lint-css

assets/go-licenses.json

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dump.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ func runDump(ctx context.Context, cmd *cli.Command) error {
265265
excludes = append(excludes, setting.LFS.Storage.Path)
266266
excludes = append(excludes, setting.Attachment.Storage.Path)
267267
excludes = append(excludes, setting.Packages.Storage.Path)
268+
excludes = append(excludes, setting.RepoArchive.Storage.Path)
268269
excludes = append(excludes, setting.Log.RootPath)
269270
if err := dumper.AddRecursiveExclude("data", setting.AppDataPath, excludes); err != nil {
270271
fatal("Failed to include data directory: %v", err)

cmd/embedded.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import (
1212
"strings"
1313

1414
"code.gitea.io/gitea/modules/assetfs"
15+
"code.gitea.io/gitea/modules/glob"
1516
"code.gitea.io/gitea/modules/log"
1617
"code.gitea.io/gitea/modules/options"
1718
"code.gitea.io/gitea/modules/public"
1819
"code.gitea.io/gitea/modules/setting"
1920
"code.gitea.io/gitea/modules/templates"
2021
"code.gitea.io/gitea/modules/util"
2122

22-
"github.com/gobwas/glob"
2323
"github.com/urfave/cli/v3"
2424
)
2525

0 commit comments

Comments
 (0)