Skip to content

Commit d0303ff

Browse files
authored
Merge branch 'main' into notext
2 parents ff0c9a0 + 1b1b850 commit d0303ff

File tree

171 files changed

+7269
-6283
lines changed

Some content is hidden

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

171 files changed

+7269
-6283
lines changed

.github/workflows/pull-compliance.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838
- uses: actions/setup-node@v4
3939
with:
4040
node-version: 20
41+
cache: npm
42+
cache-dependency-path: package-lock.json
4143
- run: pip install poetry
4244
- run: make deps-py
4345
- run: make deps-frontend
@@ -65,6 +67,8 @@ jobs:
6567
- uses: actions/setup-node@v4
6668
with:
6769
node-version: 20
70+
cache: npm
71+
cache-dependency-path: package-lock.json
6872
- run: make deps-frontend
6973
- run: make lint-swagger
7074

@@ -134,6 +138,8 @@ jobs:
134138
- uses: actions/setup-node@v4
135139
with:
136140
node-version: 20
141+
cache: npm
142+
cache-dependency-path: package-lock.json
137143
- run: make deps-frontend
138144
- run: make lint-frontend
139145
- run: make checks-frontend
@@ -181,6 +187,8 @@ jobs:
181187
- uses: actions/setup-node@v4
182188
with:
183189
node-version: 20
190+
cache: npm
191+
cache-dependency-path: package-lock.json
184192
- run: make deps-frontend
185193
- run: make lint-md
186194
- run: make docs

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
- uses: actions/setup-node@v4
2525
with:
2626
node-version: 20
27+
cache: npm
28+
cache-dependency-path: package-lock.json
2729
- run: make deps-frontend frontend deps-backend
2830
- run: npx playwright install --with-deps
2931
- run: make test-e2e-sqlite

.github/workflows/release-nightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
- uses: actions/setup-node@v4
2626
with:
2727
node-version: 20
28+
cache: npm
29+
cache-dependency-path: package-lock.json
2830
- run: make deps-frontend deps-backend
2931
# xgo build
3032
- run: make release

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
- uses: actions/setup-node@v4
2525
with:
2626
node-version: 20
27+
cache: npm
28+
cache-dependency-path: package-lock.json
2729
- run: make deps-frontend deps-backend
2830
# xgo build
2931
- run: make release

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
- uses: actions/setup-node@v4
2727
with:
2828
node-version: 20
29+
cache: npm
30+
cache-dependency-path: package-lock.json
2931
- run: make deps-frontend deps-backend
3032
# xgo build
3133
- run: make release

CHANGELOG-archived.md

Lines changed: 5223 additions & 0 deletions
Large diffs are not rendered by default.

CHANGELOG.md

Lines changed: 154 additions & 5228 deletions
Large diffs are not rendered by default.

Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(G
110110

111111
LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64
112112

113-
GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/))
114113
GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/))
115114
MIGRATE_TEST_PACKAGES ?= $(shell $(GO) list code.gitea.io/gitea/models/migrations/...)
116115

@@ -144,9 +143,9 @@ TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMAN
144143
GO_DIRS := build cmd models modules routers services tests
145144
WEB_DIRS := web_src/js web_src/css
146145

147-
ESLINT_FILES := web_src/js tools *.config.js tests/e2e
146+
ESLINT_FILES := web_src/js tools *.js tests/e2e
148147
STYLELINT_FILES := web_src/css web_src/js/components/*.vue
149-
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) docs/content templates options/locale/locale_en-US.ini .github
148+
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) docs/content templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.js *.md *.yml *.yaml *.toml))
150149
EDITORCONFIG_FILES := templates .github/workflows options/locale/locale_en-US.ini
151150

152151
GO_SOURCES := $(wildcard *.go)
@@ -423,7 +422,7 @@ lint-go-windows:
423422
lint-go-vet:
424423
@echo "Running go vet..."
425424
@GOOS= GOARCH= $(GO) build code.gitea.io/gitea-vet
426-
@$(GO) vet -vettool=gitea-vet $(GO_PACKAGES)
425+
@$(GO) vet -vettool=gitea-vet ./...
427426

428427
.PHONY: lint-editorconfig
429428
lint-editorconfig:
@@ -779,7 +778,7 @@ generate-backend: $(TAGS_PREREQ) generate-go
779778
.PHONY: generate-go
780779
generate-go: $(TAGS_PREREQ)
781780
@echo "Running go generate..."
782-
@CC= GOOS= GOARCH= $(GO) generate -tags '$(TAGS)' $(GO_PACKAGES)
781+
@CC= GOOS= GOARCH= $(GO) generate -tags '$(TAGS)' ./...
783782

784783
.PHONY: security-check
785784
security-check:

assets/go-licenses.json

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

cmd/admin_auth.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package cmd
55

66
import (
7+
"errors"
78
"fmt"
89
"os"
910
"text/tabwriter"
@@ -91,7 +92,7 @@ func runListAuth(c *cli.Context) error {
9192

9293
func runDeleteAuth(c *cli.Context) error {
9394
if !c.IsSet("id") {
94-
return fmt.Errorf("--id flag is missing")
95+
return errors.New("--id flag is missing")
9596
}
9697

9798
ctx, cancel := installSignals()

0 commit comments

Comments
 (0)