Commit a05b1ec8 authored by eric pellegrini's avatar eric pellegrini

added support for gitflow bugfix branch to gitlab config file

parent ebb7908a
...@@ -15,6 +15,7 @@ build:trusty: ...@@ -15,6 +15,7 @@ build:trusty:
- /^feature-.*$/ - /^feature-.*$/
- /^release-.*$/ - /^release-.*$/
- /^hotfix-.*$/ - /^hotfix-.*$/
- /^bugfix-.*$/
- develop - develop
artifacts: artifacts:
paths: paths:
...@@ -34,6 +35,7 @@ test:trusty: ...@@ -34,6 +35,7 @@ test:trusty:
- /^feature-.*$/ - /^feature-.*$/
- /^release-.*$/ - /^release-.*$/
- /^hotfix-.*$/ - /^hotfix-.*$/
- /^bugfix-.*$/
- develop - develop
dependencies: dependencies:
- build:trusty - build:trusty
...@@ -68,6 +70,7 @@ build:osx: ...@@ -68,6 +70,7 @@ build:osx:
- /^feature-.*$/ - /^feature-.*$/
- /^release-.*$/ - /^release-.*$/
- /^hotfix-.*$/ - /^hotfix-.*$/
- /^bugfix-.*$/
- develop - develop
artifacts: artifacts:
paths: paths:
...@@ -87,6 +90,7 @@ test:osx: ...@@ -87,6 +90,7 @@ test:osx:
- /^feature-.*$/ - /^feature-.*$/
- /^release-.*$/ - /^release-.*$/
- /^hotfix-.*$/ - /^hotfix-.*$/
- /^bugfix-.*$/
- develop - develop
dependencies: dependencies:
- build:osx - build:osx
...@@ -123,6 +127,7 @@ build:windows: ...@@ -123,6 +127,7 @@ build:windows:
- /^feature-.*$/ - /^feature-.*$/
- /^release-.*$/ - /^release-.*$/
- /^hotfix-.*$/ - /^hotfix-.*$/
- /^bugfix-.*$/
- develop - develop
artifacts: artifacts:
paths: paths:
...@@ -144,6 +149,7 @@ test:windows: ...@@ -144,6 +149,7 @@ test:windows:
- /^feature-.*$/ - /^feature-.*$/
- /^release-.*$/ - /^release-.*$/
- /^hotfix-.*$/ - /^hotfix-.*$/
- /^bugfix-.*$/
- develop - develop
dependencies: dependencies:
- build:windows - build:windows
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment