From d35e0f7ba3f94b947149a576420221c4c7daebbe Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Mon, 18 Mar 2019 22:25:28 +0400 Subject: [PATCH 1/2] add environment --- .gitlab-ci.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3ff3e3..1212605 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,10 +31,20 @@ deploy: script: - sh deploy/gdccloud/deploy.sh only: - - dev + - master cache: key: "$CI_PROJECT_ID" policy: pull paths: - build - - .gradle \ No newline at end of file + - .gradle + +deploy_staging: + stage: deploy + script: + - echo "Deploy to staging server" + environment: + name: staging + url: http://193.110.3.124:8080 + only: + - dev From c374cb42327eac059d39fb127357f51d4c614833 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Mon, 18 Mar 2019 22:35:01 +0400 Subject: [PATCH 2/2] merge deploy environments --- .gitlab-ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1212605..b14df3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,20 +31,13 @@ deploy: script: - sh deploy/gdccloud/deploy.sh only: - - master + - dev cache: key: "$CI_PROJECT_ID" policy: pull paths: - build - .gradle - -deploy_staging: - stage: deploy - script: - - echo "Deploy to staging server" environment: name: staging url: http://193.110.3.124:8080 - only: - - dev