From 42e37e686b90216c6ba96f531deeda6d7361d093 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 25 Apr 2022 15:07:08 +0200 Subject: [PATCH 1/8] Add notags to fetch (#19487) --- modules/migrations/gitea_uploader.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/migrations/gitea_uploader.go b/modules/migrations/gitea_uploader.go index 296e10ee5efaf..3211845f01d6c 100644 --- a/modules/migrations/gitea_uploader.go +++ b/modules/migrations/gitea_uploader.go @@ -613,7 +613,7 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*models.PullR } if ok { - _, err = git.NewCommand("fetch", remote, pr.Head.Ref).RunInDir(g.repo.RepoPath()) + _, err = git.NewCommand("fetch", "--no-tags", "--", remote, pr.Head.Ref).RunInDir(g.repo.RepoPath()) if err != nil { log.Error("Fetch branch from %s failed: %v", pr.Head.CloneURL, err) } else { From 8e62096c316ffde1e7616f3d748619776a9a9d19 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 16 May 2022 16:49:34 +0200 Subject: [PATCH 2/8] Disable linter as this branch is EOL --- .drone.yml | 77 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/.drone.yml b/.drone.yml index b9d928eb21753..1527bc5554a36 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,43 +19,46 @@ steps: commands: - make node_modules - - name: lint-frontend - image: node:14 - commands: - - make lint-frontend - depends_on: [deps-frontend] - - - name: lint-backend - pull: always - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env - commands: - - make lint-backend - environment: - GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not - GOSUMDB: sum.golang.org - TAGS: bindata sqlite sqlite_unlock_notify - - - name: lint-backend-windows - pull: always - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env - commands: - - make golangci-lint vet - environment: - GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not - GOSUMDB: sum.golang.org - TAGS: bindata sqlite sqlite_unlock_notify - GOOS: windows - GOARCH: amd64 - - - name: lint-backend-gogit - pull: always - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env - commands: - - make lint-backend - environment: - GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not - GOSUMDB: sum.golang.org - TAGS: bindata gogit sqlite sqlite_unlock_notify +# +# Disable linter as this branch is EOL +# +# - name: lint-frontend +# image: node:14 +# commands: +# - make lint-frontend +# depends_on: [deps-frontend] +# +# - name: lint-backend +# pull: always +# image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env +# commands: +# - make lint-backend +# environment: +# GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not +# GOSUMDB: sum.golang.org +# TAGS: bindata sqlite sqlite_unlock_notify +# +# - name: lint-backend-windows +# pull: always +# image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env +# commands: +# - make golangci-lint vet +# environment: +# GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not +# GOSUMDB: sum.golang.org +# TAGS: bindata sqlite sqlite_unlock_notify +# GOOS: windows +# GOARCH: amd64 +# +# - name: lint-backend-gogit +# pull: always +# image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env +# commands: +# - make lint-backend +# environment: +# GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not +# GOSUMDB: sum.golang.org +# TAGS: bindata gogit sqlite sqlite_unlock_notify - name: checks-frontend image: node:14 From f94b41de00f244073dd5e2c85ad9784d64df61d7 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 16 May 2022 16:50:49 +0200 Subject: [PATCH 3/8] next --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1527bc5554a36..f1d00561a169f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -71,13 +71,13 @@ steps: image: golang:1.16 commands: - make checks-backend - depends_on: [lint-backend] +# depends_on: [lint-backend] - name: test-frontend image: node:14 commands: - make test-frontend - depends_on: [lint-frontend] +# depends_on: [lint-frontend] - name: build-frontend image: node:14 From f3af22ef75c9f5e1d08b72147b328c982b91fb13 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 16 May 2022 16:54:39 +0200 Subject: [PATCH 4/8] rm-more-compliance --- .drone.yml | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) diff --git a/.drone.yml b/.drone.yml index f1d00561a169f..a0fa0ae72ecd0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,47 +19,6 @@ steps: commands: - make node_modules -# -# Disable linter as this branch is EOL -# -# - name: lint-frontend -# image: node:14 -# commands: -# - make lint-frontend -# depends_on: [deps-frontend] -# -# - name: lint-backend -# pull: always -# image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env -# commands: -# - make lint-backend -# environment: -# GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not -# GOSUMDB: sum.golang.org -# TAGS: bindata sqlite sqlite_unlock_notify -# -# - name: lint-backend-windows -# pull: always -# image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env -# commands: -# - make golangci-lint vet -# environment: -# GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not -# GOSUMDB: sum.golang.org -# TAGS: bindata sqlite sqlite_unlock_notify -# GOOS: windows -# GOARCH: amd64 -# -# - name: lint-backend-gogit -# pull: always -# image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env -# commands: -# - make lint-backend -# environment: -# GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not -# GOSUMDB: sum.golang.org -# TAGS: bindata gogit sqlite sqlite_unlock_notify - - name: checks-frontend image: node:14 commands: @@ -71,19 +30,11 @@ steps: image: golang:1.16 commands: - make checks-backend -# depends_on: [lint-backend] - - - name: test-frontend - image: node:14 - commands: - - make test-frontend -# depends_on: [lint-frontend] - name: build-frontend image: node:14 commands: - make frontend - depends_on: [test-frontend] - name: build-backend-no-gcc pull: always From 357c06ec001c0060148fd5cb032bb148303f82ab Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 16 May 2022 16:59:58 +0200 Subject: [PATCH 5/8] hotfix-docker-manifet --- docker/manifest.rootless.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/manifest.rootless.tmpl b/docker/manifest.rootless.tmpl index 9559416470778..2c6623b2d7f9c 100644 --- a/docker/manifest.rootless.tmpl +++ b/docker/manifest.rootless.tmpl @@ -4,7 +4,6 @@ tags: {{#each build.tags}} - {{this}}-rootless {{/each}} - - "latest-rootless" {{/if}} manifests: - From c2f03f45a7fded19acd833498241abb7bceeecdf Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 16 May 2022 17:08:22 +0200 Subject: [PATCH 6/8] test-bump --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index a0fa0ae72ecd0..ef8e0cd629b1d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ trigger: steps: - name: deps-frontend pull: always - image: node:14 + image: node:15 commands: - make node_modules From 39cd6b5fcdcb118186cc3bcb457c9a285d3b3ceb Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 16 May 2022 17:19:08 +0200 Subject: [PATCH 7/8] use node:16 --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index ef8e0cd629b1d..e027ca9a1539f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,12 +15,12 @@ trigger: steps: - name: deps-frontend pull: always - image: node:15 + image: node:16 commands: - make node_modules - name: checks-frontend - image: node:14 + image: node:16 commands: - make checks-frontend depends_on: [deps-frontend] @@ -32,7 +32,7 @@ steps: - make checks-backend - name: build-frontend - image: node:14 + image: node:16 commands: - make frontend From 2a24bf9d3fe84446e60c07cc69f13a1ee6a4b301 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 16 May 2022 17:21:20 +0200 Subject: [PATCH 8/8] 15 --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index e027ca9a1539f..9b100b957c746 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,12 +15,12 @@ trigger: steps: - name: deps-frontend pull: always - image: node:16 + image: node:15 commands: - make node_modules - name: checks-frontend - image: node:16 + image: node:15 commands: - make checks-frontend depends_on: [deps-frontend] @@ -32,7 +32,7 @@ steps: - make checks-backend - name: build-frontend - image: node:16 + image: node:15 commands: - make frontend