Skip to content

Add a release-cleanup step which deletes the trigger-ci-release branch #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lolski merged 3 commits into from
Feb 1, 2019
Merged

Add a release-cleanup step which deletes the trigger-ci-release branch #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42d2709
add release-clenaup. rename 'deploy' terminology to 'release'
Feb 1, 2019
ca080e5
temporarily activate the workflow-master
Feb 1, 2019
9f469b3
Revert "temporarily activate the workflow-master"
Feb 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/approve-release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ def check_output_discarding_stderr(*args, **kwargs):
status = check_output_discarding_stderr(['curl', GRABL_URL_STATUS])

if status == 'deploy':
print("Deployment approved, creating the 'trigger-workflow-deploy' branch "
print("Deployment approved, creating the 'trigger-ci-release' branch "
"in order to trigger the deployment process")
subprocess.call(['git', 'branch', 'trigger-workflow-deploy', 'HEAD'])
subprocess.call(['git', 'push', 'origin', 'trigger-workflow-deploy:trigger-workflow-deploy'])
subprocess.call(['git', 'branch', 'trigger-ci-release', 'HEAD'])
subprocess.call(['git', 'push', 'origin', 'trigger-ci-release:trigger-ci-release'])
elif status == 'do-not-deploy':
print('Deployment has been manually rejected by an administrator')
break
Expand Down
20 changes: 16 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ jobs:
- checkout
- run: python .circleci/approve-release.py

release-cleanup:
machine: true
steps:
- checkout
- run: git push --delete origin trigger-ci-release

build-workbase-linux:
machine: true
working_directory: ~/grakn
Expand Down Expand Up @@ -146,7 +152,7 @@ workflows:
- test:
filters:
branches:
ignore: /master|trigger-workflow-deploy/
ignore: /master|trigger-ci-release/
ci-master-branch:
jobs:
- test:
Expand All @@ -164,15 +170,21 @@ workflows:
- build-workbase-mac:
filters:
branches:
only: trigger-workflow-deploy
only: trigger-ci-release
- build-workbase-linux:
filters:
branches:
only: trigger-workflow-deploy
only: trigger-ci-release
- publish-github-draft:
requires:
- build-workbase-mac
- build-workbase-linux
filters:
branches:
only: trigger-workflow-deploy
only: trigger-ci-release
- release-cleanup:
requires:
- publish-github-draft
filters:
branches:
only: trigger-ci-release