Merge branch 'main' into releaselink

Author: GiteaBot

.drone.yml

@@ -12,7 +12,8 @@ trigger:
     - pull_request
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
+      - "*.md"
 
 volumes:
   - name: deps
@@ -181,7 +182,7 @@ trigger:
     - pull_request
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 volumes:
   - name: deps
@@ -266,6 +267,35 @@ steps:
       - name: deps
         path: /go
 
+---
+kind: pipeline
+type: docker
+name: compliance-docs
+
+platform:
+  os: linux
+  arch: amd64
+
+trigger:
+  event:
+    - pull_request
+  paths:
+    include:
+      - "docs/**"
+      - "*.md"
+
+steps:
+  - name: deps-frontend
+    image: node:18
+    pull: always
+    commands:
+      - make deps-frontend
+
+  - name: lint-md
+    image: node:18
+    commands:
+      - make lint-md
+
 ---
 kind: pipeline
 type: docker
@@ -283,7 +313,7 @@ trigger:
     - pull_request
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 volumes:
   - name: deps
@@ -444,7 +474,7 @@ trigger:
     - pull_request
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 volumes:
   - name: deps
@@ -530,7 +560,7 @@ trigger:
     - pull_request
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 volumes:
   - name: deps
@@ -616,7 +646,7 @@ trigger:
     - pull_request
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 volumes:
   - name: deps
@@ -696,7 +726,7 @@ trigger:
     - pull_request
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 volumes:
   - name: deps
@@ -867,7 +897,7 @@ trigger:
     - push
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 depends_on:
   - testing-mysql
@@ -1125,7 +1155,7 @@ trigger:
     - pull_request
   paths:
     include:
-      - docs/**
+      - "docs/**"
 
 steps:
   - name: build-docs
@@ -1176,7 +1206,7 @@ trigger:
     - cron
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 steps:
   - name: fetch-tags
@@ -1253,7 +1283,7 @@ trigger:
     - cron
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 steps:
   - name: fetch-tags
@@ -1468,7 +1498,7 @@ trigger:
     - pull_request
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 steps:
   - name: dryrun
@@ -1515,7 +1545,7 @@ trigger:
     - cron
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 steps:
   - name: fetch-tags
@@ -1592,7 +1622,7 @@ trigger:
     - cron
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 steps:
   - name: fetch-tags
@@ -1667,7 +1697,7 @@ trigger:
     - cron
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 steps:
   - name: fetch-tags
@@ -1834,7 +1864,7 @@ trigger:
     - cron
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 depends_on:
   - docker-linux-amd64-release-version
@@ -1884,7 +1914,7 @@ trigger:
     - cron
   paths:
     exclude:
-      - docs/**
+      - "docs/**"
 
 depends_on:
   - docker-linux-amd64-release

.eslintrc.yaml

@@ -13,6 +13,7 @@ plugins:
   - eslint-plugin-import
   - eslint-plugin-jquery
   - eslint-plugin-sonarjs
+  - eslint-plugin-custom-elements
 
 env:
   es2022: true
@@ -62,6 +63,19 @@ rules:
   consistent-this: [0]
   constructor-super: [2]
   curly: [0]
+  custom-elements/expose-class-on-global: [0]
+  custom-elements/extends-correct-class: [2]
+  custom-elements/file-name-matches-element: [0]
+  custom-elements/no-constructor: [2]
+  custom-elements/no-customized-built-in-elements: [2]
+  custom-elements/no-dom-traversal-in-attributechangedcallback: [2]
+  custom-elements/no-dom-traversal-in-connectedcallback: [2]
+  custom-elements/no-exports-with-element: [2]
+  custom-elements/no-method-prefixed-with-on: [2]
+  custom-elements/no-unchecked-define: [0]
+  custom-elements/one-element-per-file: [0]
+  custom-elements/tag-name-matches-class: [2]
+  custom-elements/valid-tag-name: [2]
   default-case-last: [2]
   default-case: [0]
   default-param-last: [0]

.gitpod.yml

@@ -23,13 +23,6 @@ tasks:
       gp sync-await setup
       make watch-frontend
     openMode: split-right
-  - name: Run docs
-    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:
   extensions:
@@ -46,5 +39,3 @@ vscode:
 ports:
   - name: Gitea
     port: 3000
-  - name: Docs
-    port: 1313

BSDmakefile

@@ -1,6 +1,7 @@
 # GNU makefile proxy script for BSD make
+#
 # Written and maintained by Mahmoud Al-Qudsi <mqudsi@neosmart.net>
-# Copyright NeoSmart Technologies <https://neosmart.net/> 2014-2018
+# Copyright NeoSmart Technologies <https://neosmart.net/> 2014-2019
 # Obtain updates from <https://github.com/neosmart/gmake-proxy>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,26 +27,32 @@
 
 JARG =
 GMAKE = "gmake"
-#When gmake is called from another make instance, -w is automatically added
-#which causes extraneous messages about directory changes to be emitted.
-#--no-print-directory silences these messages.
+# When gmake is called from another make instance, -w is automatically added
+# which causes extraneous messages about directory changes to be emitted.
+# Running with --no-print-directory silences these messages.
 GARGS = "--no-print-directory"
 
 .if "$(.MAKE.JOBS)" != ""
-JARG = -j$(.MAKE.JOBS)
+    JARG = -j$(.MAKE.JOBS)
 .endif
 
-#by default bmake will cd into ./obj first
+# bmake prefers out-of-source builds and tries to cd into ./obj (among others)
+# where possible. GNU Make doesn't, so override that value.
 .OBJDIR: ./
 
+# The GNU convention is to use the lowercased `prefix` variable/macro to
+# specify the installation directory. Humor them.
+GPREFIX = ""
+.if defined(PREFIX) && ! defined(prefix)
+    GPREFIX = 'prefix = "$(PREFIX)"'
+.endif
+
+.BEGIN: .SILENT
+	which $(GMAKE) || printf "Error: GNU Make is required!\n\n" 1>&2 && false
+
 .PHONY: FRC
 $(.TARGETS): FRC
-	$(GMAKE) $(GARGS) $(.TARGETS:S,.DONE,,) $(JARG)
+	$(GMAKE) $(GPREFIX) $(GARGS) $(.TARGETS:S,.DONE,,) $(JARG)
 
 .DONE .DEFAULT: .SILENT
-	$(GMAKE) $(GARGS) $(.TARGETS:S,.DONE,,) $(JARG)
-
-.ERROR: .SILENT
-	if ! which $(GMAKE) > /dev/null; then \
-		echo "GNU Make is required!"; \
-	fi
+	$(GMAKE) $(GPREFIX) $(GARGS) $(.TARGETS:S,.DONE,,) $(JARG)

Dockerfile

@@ -1,5 +1,5 @@
 #Build stage
-FROM golang:1.20-alpine3.17 AS build-env
+FROM docker.io/library/golang:1.20-alpine3.17 AS build-env
 
 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}
@@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
 # Begin env-to-ini build
 RUN go build contrib/environment-to-ini/environment-to-ini.go
 
-FROM alpine:3.17
+FROM docker.io/library/alpine:3.17
 LABEL maintainer="maintainers@gitea.io"
 
 EXPOSE 22 3000

Dockerfile.rootless

@@ -1,5 +1,5 @@
 #Build stage
-FROM golang:1.20-alpine3.17 AS build-env
+FROM docker.io/library/golang:1.20-alpine3.17 AS build-env
 
 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}
@@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
 # Begin env-to-ini build
 RUN go build contrib/environment-to-ini/environment-to-ini.go
 
-FROM alpine:3.17
+FROM docker.io/library/alpine:3.17
 LABEL maintainer="maintainers@gitea.io"
 
 EXPOSE 2222 3000

Makefile

@@ -196,6 +196,7 @@ help:
 	@echo " - lint                             lint everything"
 	@echo " - lint-frontend                    lint frontend files"
 	@echo " - lint-backend                     lint backend files"
+	@echo " - lint-md                          lint markdown files"
 	@echo " - checks                           run various consistency checks"
 	@echo " - checks-frontend                  check frontend files"
 	@echo " - checks-backend                   check backend files"
@@ -341,10 +342,13 @@ checks-backend: tidy-check swagger-check fmt-check misspell-check swagger-valida
 lint: lint-frontend lint-backend
 
 .PHONY: lint-frontend
-lint-frontend: node_modules
+lint-frontend: node_modules lint-md
 	npx eslint --color --max-warnings=0 --ext js,vue web_src/js build *.config.js docs/assets/js tests/e2e
 	npx stylelint --color --max-warnings=0 web_src/css
 	npx spectral lint -q -F hint $(SWAGGER_SPEC)
+
+.PHONY: lint-md
+lint-md: node_modules
 	npx markdownlint docs *.md
 
 .PHONY: lint-backend
@@ -747,7 +751,7 @@ generate-go: $(TAGS_PREREQ)
 
 .PHONY: security-check
 security-check:
-	go run $(GOVULNCHECK_PACKAGE) -v ./...
+	go run $(GOVULNCHECK_PACKAGE) ./...
 
 $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
 	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@