Commit 6cf64aff authored by eric pellegrini's avatar eric pellegrini

Update .gitlab-ci.yml

parent ace2a1a5
...@@ -20,6 +20,7 @@ build:trusty: ...@@ -20,6 +20,7 @@ build:trusty:
artifacts: artifacts:
paths: paths:
- build - build
expire_in: 1 day
tags: tags:
- ubuntu14.04 - ubuntu14.04
...@@ -57,81 +58,113 @@ deploy:trusty: ...@@ -57,81 +58,113 @@ deploy:trusty:
# osx pipeline # osx pipeline
#build:osx: build:osx:
# stage: build stage: build
# script: script:
# - ./BuildServer/Darwin/Scripts/run_build.sh - ./BuildServer/Darwin/Scripts/run_build.sh
# allow_failure: false allow_failure: false
# artifacts: only:
# paths: - triggers
# - build - tags
# tags: - /^feature-.*$/
# - mac - /^release-.*$/
- /^hotfix-.*$/
- develop
artifacts:
paths:
- build
expire_in: 1 day
tags:
- mac
#test:osx: test:osx:
# stage: test stage: test
# script: script:
# - ./BuildServer/Darwin/Scripts/run_tests.sh - ./BuildServer/Darwin/Scripts/run_tests.sh
# allow_failure: false allow_failure: false
# tags: only:
# - mac - triggers
# dependencies: - tags
# - build:osx - /^feature-.*$/
- /^release-.*$/
- /^hotfix-.*$/
- develop
dependencies:
- build:osx
tags:
- mac
#deploy:osx: deploy:osx:
# stage: deploy stage: deploy
# script: script:
# - ./BuildServer/Darwin/Scripts/run_deploy.sh - ./BuildServer/Darwin/Scripts/run_deploy.sh
# only: only:
# - master - triggers
# - develop - tags
# when: on_success - develop
# artifacts: when: on_success
# paths: artifacts:
# - BuildServer/Darwin/Build/*.dmg paths:
# tags: - BuildServer/Darwin/Build/*.dmg
# - mac tags:
- mac
# # windows 7 pipeline # # windows 7 pipeline
#build:windows: build:windows:
# stage: build stage: build
# script: script:
# - c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_build.sh" - c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_build.sh"
# - c:\cygwin64\bin\bash -c "chmod a+x ./BuildServer/Windows/run_build.sh" - c:\cygwin64\bin\bash -c "chmod a+x ./BuildServer/Windows/run_build.sh"
# - c:\cygwin64\bin\bash -c "./BuildServer/Windows/run_build.sh" - c:\cygwin64\bin\bash -c "./BuildServer/Windows/run_build.sh"
# allow_failure: false allow_failure: false
# artifacts: only:
# paths: - triggers
# - .\BuildServer\Windows\Build - tags
# tags: - /^feature-.*$/
# - windows - /^release-.*$/
- /^hotfix-.*$/
- develop
artifacts:
paths:
- .\BuildServer\Windows\Build
expire_in: 1 day
tags:
- windows
#test:windows: test:windows:
# stage: test stage: test
# script: script:
# - c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_tests.sh" - c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_tests.sh"
# - c:\cygwin64\bin\bash -c "chmod a+x ./BuildServer/Windows/run_tests.sh" - c:\cygwin64\bin\bash -c "chmod a+x ./BuildServer/Windows/run_tests.sh"
# - c:\cygwin64\bin\bash -c "./BuildServer/Windows/run_tests.sh" - c:\cygwin64\bin\bash -c "./BuildServer/Windows/run_tests.sh"
# allow_failure: false allow_failure: false
# tags: only:
# - windows - triggers
# dependencies: - tags
# - build:windows - /^feature-.*$/
- /^release-.*$/
- /^hotfix-.*$/
- develop
dependencies:
- build:windows
tags:
- windows
#deploy:windows: deploy:windows:
# stage: deploy stage: deploy
# script: script:
# - c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_deploy.sh" - c:\cygwin64\bin\bash -c "dos2unix.exe ./BuildServer/Windows/run_deploy.sh"
# - c:\cygwin64\bin\bash -c "chmod a+x ./BuildServer/Windows/run_deploy.sh" - c:\cygwin64\bin\bash -c "chmod a+x ./BuildServer/Windows/run_deploy.sh"
# - c:\cygwin64\bin\bash -c "./BuildServer/Windows/run_deploy.sh" - c:\cygwin64\bin\bash -c "./BuildServer/Windows/run_deploy.sh"
# only: only:
# - master - triggers
# - develop - tags
# when: on_success - develop
# artifacts: when: on_success
# paths: artifacts:
# - BuildServer/Windows/Build/MDANSE*.exe paths:
# tags: - BuildServer/Windows/Build/MDANSE*.exe
# - windows tags:
- 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