Merge branch 'main' of https://github.com/go-gitea/gitea into feature-cran

Author: KN4CK3R

.drone.yml

@@ -726,7 +726,7 @@ steps:
 
   # TODO: We should probably build all dependencies into a test image
   - name: test-e2e
-    image: mcr.microsoft.com/playwright:v1.29.2-focal
+    image: mcr.microsoft.com/playwright:v1.31.2-focal
     commands:
       - curl -sLO https://go.dev/dl/go1.20.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.20.linux-amd64.tar.gz
       - groupadd --gid 1001 gitea && useradd -m --gid 1001 --uid 1001 gitea
@@ -1129,7 +1129,7 @@ trigger:
 
 steps:
   - name: build-docs
-    image: gitea/test_env:linux-1.20-amd64
+    image: gitea/test_env:linux-1.20-arm64
     commands:
       - cd docs
       - make trans-copy clean build

.gitpod.yml

@@ -24,8 +24,11 @@ tasks:
       make watch-frontend
     openMode: split-right
   - name: Run docs
-    before: sudo bash -c "$(grep 'https://github.com/gohugoio/hugo/releases/download' Makefile | tr -d '\')" # install hugo
-    command: cd docs && make clean update && hugo server -D -F --baseUrl $(gp url 1313) --liveReloadPort=443 --appendPort=false --bind=0.0.0.0
+    command: |
+      gp sync-await setup
+      cd docs
+      make clean update
+      hugo server -D -F --baseUrl $(gp url 1313) --liveReloadPort=443 --appendPort=false --bind=0.0.0.0
     openMode: split-right
 
 vscode:

.npmrc

@@ -3,3 +3,4 @@ fund=false
 update-notifier=false
 package-lock=true
 save-exact=true
+lockfile-version=3

CHANGELOG.md

@@ -5,7 +5,6 @@ Kees de Vries <[email protected]> (@Bwko)
 Kim Carlbäcker <[email protected]> (@bkcsoft)
 LefsFlare <[email protected]> (@LefsFlarey)
 Lunny Xiao <[email protected]> (@lunny)
-Matthias Loibl <[email protected]> (@metalmatze)
 Rachid Zarouali <[email protected]> (@xinity)
 Rémy Boulanouar <[email protected]> (@DblK)
 Sandro Santilli <[email protected]> (@strk)

MAINTAINERS

@@ -77,6 +77,7 @@ ifeq ($(RACE_ENABLED),true)
 endif
 
 STORED_VERSION_FILE := VERSION
+HUGO_VERSION ?= 0.111.3
 
 ifneq ($(DRONE_TAG),)
 	VERSION ?= $(subst v,,$(DRONE_TAG))
@@ -130,7 +131,7 @@ TEST_TAGS ?= sqlite sqlite_unlock_notify
 
 TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMANTIC_WORK_DIR)/node_modules $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR) $(GO_LICENSE_TMP_DIR)
 
-GO_DIRS := cmd tests models modules routers build services tools
+GO_DIRS := build cmd models modules routers services tests
 WEB_DIRS := web_src/js web_src/css
 
 GO_SOURCES := $(wildcard *.go)
@@ -188,6 +189,7 @@ help:
 	@echo " - clean                            delete backend and integration files"
 	@echo " - clean-all                        delete backend, frontend and integration files"
 	@echo " - deps                             install dependencies"
+	@echo " - deps-docs                        install docs dependencies"
 	@echo " - deps-frontend                    install frontend dependencies"
 	@echo " - deps-backend                     install backend dependencies"
 	@echo " - deps-tools                       install tool dependencies"
@@ -217,7 +219,6 @@ help:
 	@echo " - tidy                             run go mod tidy"
 	@echo " - test[\#TestSpecificName]    	    run unit test"
 	@echo " - test-sqlite[\#TestSpecificName]  run integration test for sqlite"
-	@echo " - pr#<index>                       build and start gitea from a PR with integration test data loaded"
 
 .PHONY: go-check
 go-check:
@@ -273,7 +274,7 @@ fmt:
 
 .PHONY: fmt-check
 fmt-check: fmt
-	@diff=$$(git diff $(GO_SOURCES) templates $(WEB_DIRS)); \
+	@diff=$$(git diff --color=always $(GO_SOURCES) templates $(WEB_DIRS)); \
 	if [ -n "$$diff" ]; then \
 	  echo "Please run 'make fmt' and commit the result:"; \
 	  echo "$${diff}"; \
@@ -309,7 +310,7 @@ $(SWAGGER_SPEC): $(GO_SOURCES_NO_BINDATA)
 
 .PHONY: swagger-check
 swagger-check: generate-swagger
-	@diff=$$(git diff '$(SWAGGER_SPEC)'); \
+	@diff=$$(git diff --color=always '$(SWAGGER_SPEC)'); \
 	if [ -n "$$diff" ]; then \
 		echo "Please run 'make generate-swagger' and commit the result:"; \
 		echo "$${diff}"; \
@@ -351,7 +352,7 @@ lint-backend: golangci-lint vet editorconfig-checker
 
 .PHONY: watch
 watch:
-	bash tools/watch.sh
+	bash build/watch.sh
 
 .PHONY: watch-frontend
 watch-frontend: node-check node_modules
@@ -414,7 +415,7 @@ vendor: go.mod go.sum
 
 .PHONY: tidy-check
 tidy-check: tidy
-	@diff=$$(git diff go.mod go.sum $(GO_LICENSE_FILE)); \
+	@diff=$$(git diff --color=always go.mod go.sum $(GO_LICENSE_FILE)); \
 	if [ -n "$$diff" ]; then \
 		echo "Please run 'make tidy' and commit the result:"; \
 		echo "$${diff}"; \
@@ -815,14 +816,17 @@ release-docs: | $(DIST_DIRS) docs
 	tar -czf $(DIST)/release/gitea-docs-$(VERSION).tar.gz -C ./docs/public .
 
 .PHONY: docs
-docs:
+docs: deps-docs
+	cd docs; make trans-copy clean build-offline;
+
+.PHONY: deps-docs
+deps-docs:
 	@hash hugo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-		curl -sL https://github.com/gohugoio/hugo/releases/download/v0.74.3/hugo_0.74.3_Linux-64bit.tar.gz | tar zxf - -C /tmp && mv /tmp/hugo /usr/bin/hugo && chmod +x /usr/bin/hugo; \
+		curl -sL https://github.com/gohugoio/hugo/releases/download/v$(HUGO_VERSION)/hugo_$(HUGO_VERSION)_Linux-64bit.tar.gz | tar zxf - -C /tmp && mkdir -p ~/go/bin && mv /tmp/hugo ~/go/bin/hugo && chmod +x ~/go/bin/hugo; \
 	fi
-	cd docs; make trans-copy clean build-offline;
 
 .PHONY: deps
-deps: deps-frontend deps-backend deps-tools
+deps: deps-frontend deps-backend deps-tools deps-docs
 
 .PHONY: deps-frontend
 deps-frontend: node_modules
@@ -885,7 +889,7 @@ svg: node-check | node_modules
 .PHONY: svg-check
 svg-check: svg
 	@git add $(SVG_DEST_DIR)
-	@diff=$$(git diff --cached $(SVG_DEST_DIR)); \
+	@diff=$$(git diff --color=always --cached $(SVG_DEST_DIR)); \
 	if [ -n "$$diff" ]; then \
 		echo "Please run 'make svg' and 'git add $(SVG_DEST_DIR)' and commit the result:"; \
 		echo "$${diff}"; \
@@ -895,7 +899,7 @@ svg-check: svg
 .PHONY: lockfile-check
 lockfile-check:
 	npm install --package-lock-only
-	@diff=$$(git diff package-lock.json); \
+	@diff=$$(git diff --color=always package-lock.json); \
 	if [ -n "$$diff" ]; then \
 		echo "package-lock.json is inconsistent with package.json"; \
 		echo "Please run 'npm install --package-lock-only' and commit the result:"; \
@@ -934,10 +938,6 @@ generate-manpage:
 	@gzip -9 man/man1/gitea.1 && echo man/man1/gitea.1.gz created
 	@#TODO A small script that formats config-cheat-sheet.en-us.md nicely for use as a config man page
 
-.PHONY: pr\#%
-pr\#%: clean-all
-	$(GO) run contrib/pr/checkout.go $*
-
 .PHONY: golangci-lint
 golangci-lint:
 	$(GO) run $(GOLANGCI_LINT_PACKAGE) run

Makefile

@@ -0,0 +1,92 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+//go:build ignore
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"gopkg.in/ini.v1"
+)
+
+func main() {
+	if len(os.Args) != 2 {
+		println("usage: backport-locales <to-ref>")
+		println("eg: backport-locales release/v1.19")
+		os.Exit(1)
+	}
+
+	ini.PrettyFormat = false
+	mustNoErr := func(err error) {
+		if err != nil {
+			panic(err)
+		}
+	}
+	collectInis := func(ref string) map[string]*ini.File {
+		inis := map[string]*ini.File{}
+		err := filepath.WalkDir("options/locale", func(path string, d os.DirEntry, err error) error {
+			if err != nil {
+				return err
+			}
+			if d.IsDir() || !strings.HasSuffix(d.Name(), ".ini") {
+				return nil
+			}
+			cfg, err := ini.LoadSources(ini.LoadOptions{
+				IgnoreInlineComment:         true,
+				UnescapeValueCommentSymbols: true,
+			}, path)
+			mustNoErr(err)
+			inis[path] = cfg
+			fmt.Printf("collecting: %s @ %s\n", path, ref)
+			return nil
+		})
+		mustNoErr(err)
+		return inis
+	}
+
+	// collect new locales from current working directory
+	inisNew := collectInis("HEAD")
+
+	// switch to the target ref, and collect the old locales
+	cmd := exec.Command("git", "checkout", os.Args[1])
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	mustNoErr(cmd.Run())
+	inisOld := collectInis(os.Args[1])
+
+	// use old en-US as the base, and copy the new translations to the old locales
+	enUsOld := inisOld["options/locale/locale_en-US.ini"]
+	for path, iniOld := range inisOld {
+		if iniOld == enUsOld {
+			continue
+		}
+		iniNew := inisNew[path]
+		if iniNew == nil {
+			continue
+		}
+		for _, secEnUS := range enUsOld.Sections() {
+			secOld := iniOld.Section(secEnUS.Name())
+			secNew := iniNew.Section(secEnUS.Name())
+			for _, keyEnUs := range secEnUS.Keys() {
+				if secNew.HasKey(keyEnUs.Name()) {
+					oldStr := secOld.Key(keyEnUs.Name()).String()
+					newStr := secNew.Key(keyEnUs.Name()).String()
+					// A bug: many of new translations with ";" are broken in Crowdin (due to last messy restoring)
+					// As the broken strings are gradually fixed, this workaround check could be removed (in a few months?)
+					if strings.Contains(oldStr, ";") && !strings.Contains(newStr, ";") {
+						println("skip potential broken string", path, secEnUS.Name(), keyEnUs.Name())
+						continue
+					}
+					secOld.Key(keyEnUs.Name()).SetValue(newStr)
+				}
+			}
+		}
+		mustNoErr(iniOld.SaveTo(path))
+	}
+}

assets/go-licenses.json

@@ -65,7 +65,6 @@ func newFileCollector(fileFilter string, batchSize int) (*fileCollector, error)
 			"modules",
 			"routers",
 			"services",
-			"tools",
 		}
 		co.includePatterns = append(co.includePatterns, regexp.MustCompile(`.*\.go$`))
 

build/backport-locales.go

@@ -25,14 +25,22 @@ async function processFile(file, {prefix, fullName} = {}) {
     if (prefix === 'octicon') name = name.replace(/-[0-9]+$/, ''); // chop of '-16' on octicons
   }
 
+  // Set the `xmlns` attribute so that the files are displayable in standalone documents
+  // The svg backend module will strip the attribute during startup for inline display
   const {data} = optimize(await readFile(file, 'utf8'), {
     plugins: [
       {name: 'preset-default'},
-      {name: 'removeXMLNS'},
       {name: 'removeDimensions'},
       {name: 'prefixIds', params: {prefix: () => name}},
       {name: 'addClassesToSVGElement', params: {classNames: ['svg', name]}},
-      {name: 'addAttributesToSVGElement', params: {attributes: [{'width': '16'}, {'height': '16'}, {'aria-hidden': 'true'}]}},
+      {
+        name: 'addAttributesToSVGElement', params: {
+          attributes: [
+            {'xmlns': 'http://www.w3.org/2000/svg'},
+            {'width': '16'}, {'height': '16'}, {'aria-hidden': 'true'},
+          ]
+        }
+      },
     ],
   });