From 7217b703e95a3ab01b69f91879fb4d6532f0b2c5 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 15 Dec 2019 19:06:36 +0100 Subject: [PATCH] Combine Drone release steps (#9338) * Combine Drone release steps Fixes missing JS/CSS because drone did unwanted parallelization of the js/css task and the generate task. Combined the tasks into one and made 'make release' work standalone. Fixes: https://github.com/go-gitea/gitea/issues/9324 Fixes: https://github.com/go-gitea/gitea/issues/9362 * move js/css to generate dependencies * remove unneccessary go-all target * remove go target as well --- .drone.yml | 30 ++++-------------------------- Makefile | 10 ++-------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/.drone.yml b/.drone.yml index b44bcb872..99c3f4bdd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -388,17 +388,12 @@ steps: commands: - git fetch --tags --force - - name: build - pull: always - image: node:10 # this step is kept at the lowest version of node that we support - commands: - - make css - - make js - - name: static pull: always image: techknowlogick/xgo:latest commands: + - apt update && apt -y install curl + - curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs - export PATH=$PATH:$GOPATH/bin - make release environment: @@ -419,8 +414,6 @@ steps: from_secret: gpgsign_key GPGSIGN_PASSPHRASE: from_secret: gpgsign_passphrase - depends_on: - - static - name: release-branch-release pull: always @@ -438,8 +431,6 @@ steps: from_secret: aws_access_key_id AWS_SECRET_ACCESS_KEY: from_secret: aws_secret_access_key - depends_on: - - gpg-sign when: branch: - "release/*" @@ -462,8 +453,6 @@ steps: from_secret: aws_access_key_id AWS_SECRET_ACCESS_KEY: from_secret: aws_secret_access_key - depends_on: - - gpg-sign when: branch: - master @@ -496,17 +485,12 @@ steps: commands: - git fetch --tags --force - - name: build - pull: always - image: node:10 # this step is kept at the lowest version of node that we support - commands: - - make css - - make js - - name: static pull: always image: techknowlogick/xgo:latest commands: + - apt update && apt -y install curl + - curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs - export PATH=$PATH:$GOPATH/bin - make release environment: @@ -527,8 +511,6 @@ steps: from_secret: gpgsign_key GPGSIGN_PASSPHRASE: from_secret: gpgsign_passphrase - depends_on: - - static - name: release pull: always @@ -546,8 +528,6 @@ steps: from_secret: aws_access_key_id AWS_SECRET_ACCESS_KEY: from_secret: aws_secret_access_key - depends_on: - - gpg-sign - name: github pull: always @@ -558,8 +538,6 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - depends_on: - - gpg-sign --- kind: pipeline diff --git a/Makefile b/Makefile index d217405fb..ef2753062 100644 --- a/Makefile +++ b/Makefile @@ -128,7 +128,7 @@ vet: $(GO) vet $(PACKAGES) .PHONY: generate -generate: +generate: js css GO111MODULE=on $(GO) generate -mod=vendor $(PACKAGES) .PHONY: generate-swagger @@ -384,14 +384,8 @@ check: test install: $(wildcard *.go) $(GO) install -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -.PHONY: go -go: go-check $(EXECUTABLE) - -.PHONY: go-all -go-all: go-check generate go - .PHONY: build -build: js css go-all +build: go-check generate $(EXECUTABLE) $(EXECUTABLE): $(GO_SOURCES) GO111MODULE=on $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@