Skip to content

Commit 60a39da

Browse files
committed
Merge branch 'pipeline-for-develop' into 'master'
Enhancing pipeline for develop See merge request centerorbit/depcharge!62
2 parents 4ac8b51 + fde9a5a commit 60a39da

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

.gitlab-ci.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,9 @@ build-mac:
118118
paths:
119119
- depcharge-mac
120120
only:
121-
- tags
121+
- develop
122122
- master
123+
- tags
123124

124125
build-win:
125126
image: golang:1-alpine
@@ -139,8 +140,9 @@ build-win:
139140
paths:
140141
- depcharge.exe
141142
only:
142-
- tags
143+
- develop
143144
- master
145+
- tags
144146

145147
#build-docker:
146148
# image: docker:latest
@@ -159,8 +161,9 @@ build-win:
159161
#
160162
# - docker push $CI_REGISTRY_IMAGE:$IMAGE_NAME
161163
# only:
162-
# - tags
164+
# - develop
163165
# - master
166+
# - tags
164167

165168
release:
166169
image: registry.gitlab.com/centerorbit/release-github
@@ -204,8 +207,9 @@ release:
204207
- zip -m $RELEASE_NAME.zip depcharge.exe
205208
- php /var/code/uploadBinary.php
206209
only:
207-
- tags
210+
- develop
208211
- master
212+
- tags
209213

210214

211215
pages:
@@ -220,4 +224,5 @@ pages:
220224
paths:
221225
- public
222226
only:
227+
- develop
223228
- master

0 commit comments

Comments
 (0)