Skip to content

Commit

Permalink
Merge branch 'main' into findReadmeFile-infiniteloop
Browse files Browse the repository at this point in the history
  • Loading branch information
kousu authored Apr 9, 2023
2 parents afc4310 + 55d93fe commit 75e30c3
Show file tree
Hide file tree
Showing 490 changed files with 9,050 additions and 4,640 deletions.
66 changes: 48 additions & 18 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ trigger:
- pull_request
paths:
exclude:
- docs/**
- "docs/**"
- "*.md"

volumes:
- name: deps
Expand Down Expand Up @@ -181,7 +182,7 @@ trigger:
- pull_request
paths:
exclude:
- docs/**
- "docs/**"

volumes:
- name: deps
Expand Down Expand Up @@ -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
Expand All @@ -283,7 +313,7 @@ trigger:
- pull_request
paths:
exclude:
- docs/**
- "docs/**"

volumes:
- name: deps
Expand Down Expand Up @@ -444,7 +474,7 @@ trigger:
- pull_request
paths:
exclude:
- docs/**
- "docs/**"

volumes:
- name: deps
Expand Down Expand Up @@ -530,7 +560,7 @@ trigger:
- pull_request
paths:
exclude:
- docs/**
- "docs/**"

volumes:
- name: deps
Expand Down Expand Up @@ -616,7 +646,7 @@ trigger:
- pull_request
paths:
exclude:
- docs/**
- "docs/**"

volumes:
- name: deps
Expand Down Expand Up @@ -696,7 +726,7 @@ trigger:
- pull_request
paths:
exclude:
- docs/**
- "docs/**"

volumes:
- name: deps
Expand Down Expand Up @@ -726,7 +756,7 @@ steps:

# TODO: We should probably build all dependencies into a test image
- name: test-e2e
image: mcr.microsoft.com/playwright:v1.31.2-focal
image: mcr.microsoft.com/playwright:v1.32.1-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
Expand Down Expand Up @@ -867,7 +897,7 @@ trigger:
- push
paths:
exclude:
- docs/**
- "docs/**"

depends_on:
- testing-mysql
Expand Down Expand Up @@ -1125,7 +1155,7 @@ trigger:
- pull_request
paths:
include:
- docs/**
- "docs/**"

steps:
- name: build-docs
Expand Down Expand Up @@ -1176,7 +1206,7 @@ trigger:
- cron
paths:
exclude:
- docs/**
- "docs/**"

steps:
- name: fetch-tags
Expand Down Expand Up @@ -1253,7 +1283,7 @@ trigger:
- cron
paths:
exclude:
- docs/**
- "docs/**"

steps:
- name: fetch-tags
Expand Down Expand Up @@ -1468,7 +1498,7 @@ trigger:
- pull_request
paths:
exclude:
- docs/**
- "docs/**"

steps:
- name: dryrun
Expand Down Expand Up @@ -1515,7 +1545,7 @@ trigger:
- cron
paths:
exclude:
- docs/**
- "docs/**"

steps:
- name: fetch-tags
Expand Down Expand Up @@ -1592,7 +1622,7 @@ trigger:
- cron
paths:
exclude:
- docs/**
- "docs/**"

steps:
- name: fetch-tags
Expand Down Expand Up @@ -1667,7 +1697,7 @@ trigger:
- cron
paths:
exclude:
- docs/**
- "docs/**"

steps:
- name: fetch-tags
Expand Down Expand Up @@ -1834,7 +1864,7 @@ trigger:
- cron
paths:
exclude:
- docs/**
- "docs/**"

depends_on:
- docker-linux-amd64-release-version
Expand Down Expand Up @@ -1884,7 +1914,7 @@ trigger:
- cron
paths:
exclude:
- docs/**
- "docs/**"

depends_on:
- docker-linux-amd64-release
Expand Down
16 changes: 15 additions & 1 deletion .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ plugins:
- eslint-plugin-import
- eslint-plugin-jquery
- eslint-plugin-sonarjs
- eslint-plugin-custom-elements

env:
es2022: true
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -164,7 +178,7 @@ rules:
jquery/no-parse-html: [2]
jquery/no-prop: [0]
jquery/no-proxy: [2]
jquery/no-ready: [0]
jquery/no-ready: [2]
jquery/no-serialize: [2]
jquery/no-show: [2]
jquery/no-size: [2]
Expand Down
9 changes: 0 additions & 9 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -46,5 +39,3 @@ vscode:
ports:
- name: Gitea
port: 3000
- name: Docs
port: 1313
1 change: 1 addition & 0 deletions .stylelintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ rules:
no-invalid-position-at-import-rule: null
no-irregular-whitespace: true
no-unknown-animations: null
no-unknown-custom-properties: null
number-max-precision: null
property-allowed-list: null
property-disallowed-list: null
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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}
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.rootless
Original file line number Diff line number Diff line change
@@ -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}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Jimmy Praet <jimmy.praet@telenet.be> (@jpraet)
Leon Hofmeister <dev.lh@web.de> (@delvh)
Wim <wim@42.be> (@42wim)
Jason Song <i@wolfogre.com> (@wolfogre)
Yarden Shoham <hrsi88@gmail.com> (@yardenshoham)
Yarden Shoham <git@yardenshoham.com> (@yardenshoham)
Yu Tian <zettat123@gmail.com> (@Zettat123)
Eddie Yang <576951401@qq.com> (@yp05327)
Dong Ge <gedong_1994@163.com> (@sillyguodong)
Expand Down
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 $@
Expand Down
Loading

0 comments on commit 75e30c3

Please sign in to comment.