Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
MDANSE
Commits
eee5cf48
Commit
eee5cf48
authored
Sep 28, 2016
by
eric pellegrini
Browse files
Merge branch 'master' into release-test
parents
7ba6bf5d
59534bf6
Changes
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
eee5cf48
...
...
@@ -42,81 +42,81 @@ deploy:trusty:
# osx pipeline
build:osx:
stage
:
build
script
:
-
./BuildServer/Darwin/Scripts/run_build.sh
allow_failure
:
false
artifacts
:
paths
:
-
build
tags
:
-
mac
#
build:osx:
#
stage: build
#
script:
#
- ./BuildServer/Darwin/Scripts/run_build.sh
#
allow_failure: false
#
artifacts:
#
paths:
#
- build
#
tags:
#
- mac
test:osx:
stage
:
test
script
:
-
./BuildServer/Darwin/Scripts/run_tests.sh
allow_failure
:
false
tags
:
-
mac
dependencies
:
-
build:osx
#
test:osx:
#
stage: test
#
script:
#
- ./BuildServer/Darwin/Scripts/run_tests.sh
#
allow_failure: false
#
tags:
#
- mac
#
dependencies:
#
- build:osx
deploy:osx:
stage
:
deploy
script
:
-
./BuildServer/Darwin/Scripts/run_deploy.sh
only
:
-
master
-
develop
when
:
on_success
artifacts
:
paths
:
-
BuildServer/Darwin/Build/*.dmg
tags
:
-
mac
#
deploy:osx:
#
stage: deploy
#
script:
#
- ./BuildServer/Darwin/Scripts/run_deploy.sh
#
only:
#
- master
#
- develop
#
when: on_success
#
artifacts:
#
paths:
#
- BuildServer/Darwin/Build/*.dmg
#
tags:
#
- mac
# # windows 7 pipeline
build:windows:
stage
:
build
script
:
-
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 "./BuildServer/Windows/run_build.sh"
allow_failure
:
false
artifacts
:
paths
:
-
.\BuildServer\Windows\Build
tags
:
-
windows
#
build:windows:
#
stage: build
#
script:
#
- 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 "./BuildServer/Windows/run_build.sh"
#
allow_failure: false
#
artifacts:
#
paths:
#
- .\BuildServer\Windows\Build
#
tags:
#
- windows
test:windows:
stage
:
test
script
:
-
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 "./BuildServer/Windows/run_tests.sh"
allow_failure
:
false
tags
:
-
windows
dependencies
:
-
build:windows
#
test:windows:
#
stage: test
#
script:
#
- 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 "./BuildServer/Windows/run_tests.sh"
#
allow_failure: false
#
tags:
#
- windows
#
dependencies:
#
- build:windows
deploy:windows:
stage
:
deploy
script
:
-
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 "./BuildServer/Windows/run_deploy.sh"
only
:
-
master
-
develop
when
:
on_success
artifacts
:
paths
:
-
BuildServer/Windows/Build/MDANSE*.exe
tags
:
-
windows
#
deploy:windows:
#
stage: deploy
#
script:
#
- 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 "./BuildServer/Windows/run_deploy.sh"
#
only:
#
- master
#
- develop
#
when: on_success
#
artifacts:
#
paths:
#
- BuildServer/Windows/Build/MDANSE*.exe
#
tags:
#
- windows
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment