diff options
author | silverwind <me@silverwind.io> | 2019-12-15 19:06:36 +0100 |
---|---|---|
committer | techknowlogick <techknowlogick@gitea.io> | 2019-12-15 13:06:36 -0500 |
commit | 7217b703e95a3ab01b69f91879fb4d6532f0b2c5 (patch) | |
tree | 968c647cdf8f7580c6aba91fed52b7f2adec6611 /.drone.yml | |
parent | 60b31c8f01cbfdad5435510a9b8b05f84fe38a78 (diff) | |
download | gitea-7217b703e95a3ab01b69f91879fb4d6532f0b2c5.tar.gz gitea-7217b703e95a3ab01b69f91879fb4d6532f0b2c5.zip |
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
Diffstat (limited to '.drone.yml')
-rw-r--r-- | .drone.yml | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/.drone.yml b/.drone.yml index b44bcb8725..99c3f4bdd4 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 |