Skip to content

Commit 6003755

Browse files
committed
Merge branch 'main' into mainzjj
* main: fix(deps): update dependency mermaid to v11.15.0 [security], add e2e test (go-gitea#37662) ci: Also lint json5 files (go-gitea#37659) fix(templates): avoid misleading compare message when branches lack merge base (go-gitea#37651) fix(deps): update npm dependencies (go-gitea#37647) refactor: routing info middleware (go-gitea#37653) chore(deps): update action dependencies (major) (go-gitea#37638) fix(deps): update go dependencies (major) (go-gitea#37639) ci(renovate): update Go import paths on major bumps (go-gitea#37641) fix(packages): Add label for private and internal package and fix composor package source permission check (go-gitea#37610) refactor: replace Fomantic search module with first-party code (go-gitea#37443) fix(deps): update npm dependencies (go-gitea#37636) fix(deps): update module code.gitea.io/sdk/gitea to v0.25.0 (go-gitea#37637) feat(api): add last_sync to repository API (go-gitea#37566) test(e2e): run playwright via container (go-gitea#37300) feat(editor): broaden language detection in web code editor (go-gitea#37619) refactor(log): replace log.Critical with log.Error (go-gitea#37624) fix: "run as root" check (go-gitea#37622) fix: improve actions status icons and texts (go-gitea#37206) # Conflicts: # pnpm-workspace.yaml
2 parents 091fb15 + 6a27066 commit 6003755

100 files changed

Lines changed: 2960 additions & 2505 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/files-changed.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ jobs:
119119
120120
json:
121121
- "**/*.json"
122+
- "**/*.json5"
122123
123124
e2e:
124125
- "tests/e2e/**"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
minio:
3535
# as github actions doesn't support "entrypoint", we need to use a non-official image
3636
# that has a custom entrypoint set to "minio server /data"
37-
image: bitnamilegacy/minio:2023.12.23
37+
image: bitnamilegacy/minio:2025.7.23
3838
env:
3939
MINIO_ROOT_USER: 123456
4040
MINIO_ROOT_PASSWORD: 12345678
@@ -127,10 +127,10 @@ jobs:
127127
ports:
128128
- 6379:6379
129129
minio:
130-
image: bitnamilegacy/minio:2021.12.29
130+
image: bitnamilegacy/minio:2025.7.23
131131
env:
132-
MINIO_ACCESS_KEY: 123456
133-
MINIO_SECRET_KEY: 12345678
132+
MINIO_ROOT_USER: 123456
133+
MINIO_ROOT_PASSWORD: 12345678
134134
ports:
135135
- "9000:9000"
136136
devstoreaccount1.azurite.local: # https://github.com/Azure/Azurite/issues/1583

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,12 +468,11 @@ migrations.individual.test\#%:
468468

469469
.PHONY: playwright
470470
playwright: deps-frontend
471-
@# on GitHub Actions VMs, playwright's system deps are pre-installed
472-
@pnpm exec playwright install $(if $(GITHUB_ACTIONS),,--with-deps) chromium firefox $(PLAYWRIGHT_FLAGS)
471+
@./tools/test-e2e.sh install
473472

474473
.PHONY: test-e2e
475474
test-e2e: playwright frontend backend
476-
@EXECUTABLE=$(EXECUTABLE) ./tools/test-e2e.sh $(GITEA_TEST_E2E_FLAGS)
475+
@EXECUTABLE=$(EXECUTABLE) ./tools/test-e2e.sh run $(GITEA_TEST_E2E_FLAGS)
477476

478477
.PHONY: build
479478
build: frontend backend ## build everything
@@ -661,6 +660,10 @@ generate-gitignore: ## update gitignore files
661660
generate-images: | node_modules ## generate images
662661
cd tools && node generate-images.ts $(TAGS)
663662

663+
.PHONY: generate-codemirror-languages
664+
generate-codemirror-languages: | node_modules ## generate codemirror languages
665+
node tools/generate-codemirror-languages.ts
666+
664667
.PHONY: generate-manpage
665668
generate-manpage: ## generate manpage
666669
@[ -f gitea ] || make backend

0 commit comments

Comments
 (0)