diff --git a/.drone.yml b/.drone.yml index b9d928eb21753..9b100b957c746 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,50 +15,12 @@ trigger: steps: - name: deps-frontend pull: always - image: node:14 + image: node:15 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 - - name: checks-frontend - image: node:14 + image: node:15 commands: - make checks-frontend depends_on: [deps-frontend] @@ -68,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 + image: node:15 commands: - make frontend - depends_on: [test-frontend] - name: build-backend-no-gcc pull: always 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: - 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 {