Skip to content

Commit

Permalink
Merge pull request #18 from OpenShot/feature/merge-develop-back-to-re…
Browse files Browse the repository at this point in the history
…lease

Updating release branch from develop
  • Loading branch information
jonoomph authored Jun 7, 2018
2 parents fae1a2e + c1c27f7 commit 52536e4
Showing 1 changed file with 1 addition and 21 deletions.
22 changes: 1 addition & 21 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ linux-builder:
when: always
tags:
- linux
only:
- develop
- release
- tags

mac-builder:
stage: build-libopenshot-audio
Expand All @@ -37,10 +33,6 @@ mac-builder:
when: always
tags:
- mac
only:
- develop
- release
- tags

windows-builder-x86:
stage: build-libopenshot-audio
Expand All @@ -62,10 +54,6 @@ windows-builder-x86:
when: always
tags:
- windows
only:
- develop
- release
- tags

windows-builder-x64:
stage: build-libopenshot-audio
Expand All @@ -87,10 +75,6 @@ windows-builder-x64:
when: always
tags:
- windows
only:
- develop
- release
- tags

trigger-pipeline:
stage: trigger-libopenshot
Expand All @@ -99,8 +83,4 @@ trigger-pipeline:
when: always
dependencies: []
tags:
- linux
only:
- develop
- release
- tags
- linux

0 comments on commit 52536e4

Please sign in to comment.