Commit 8c02fc97 authored by eric pellegrini's avatar eric pellegrini

advances in gitlab-gitflow integration

parent 1bbf15dd
Pipeline #929 passed with stage
in 5 minutes and 56 seconds
......@@ -42,50 +42,53 @@ stages:
# osx pipeline
build:osx:
#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
#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:
- ./BuildServer/Darwin/Scripts/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 "./BuildServer/Windows/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
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
# tags:
# - windows
- windows
# test:windows:
# stage: test
......
......@@ -10,8 +10,6 @@ else
BUILD_TARGET=$1
fi
VERSION_NAME=`cat MDANSE/__pkginfo__.py | sed "s/__version__\s*=\s*'\(.*\)'/\1/"`
if [ "$BUILD_TARGET" = "win32" ]; then
PYTHON_SUFFIX=""
MSVC_BUILD_TARGET="/x86"
......@@ -54,7 +52,6 @@ if [ -e "$TARGET_DIR_CYGWIN" ]; then
rm -rf ${TARGET_DIR_CYGWIN}
fi
DEPENDENCIES_DIR=${CI_WINDOWS_DEPENDENCIES_PATH_UNIX}/${BUILD_TARGET}
PYTHON_MSI=python-${PYTHON_VERSION}${PYTHON_SUFFIX}.msi
......@@ -65,7 +62,7 @@ cmd /c "msiexec /L* pythonlog.txt /qn /a ${PYTHON_MSI_WIN} TARGETDIR=${TARGET_D
# Exit now if something goes wrong
if [ $? -ne 0 ]; then
status = $?
status=$?
echo "Failed to extract python"
exit status
fi
......@@ -205,7 +202,7 @@ cmd /V:ON /E:ON /C "setup_and_build.bat" "${CI_PROJECT_DIR_WIN}" "${TARGET_DIR}"
# Exit now if unable to build
if [ $? -ne 0 ]; then
status = $?
status=$?
echo "Failed to build MDANSE"
exit status
fi
......@@ -12,17 +12,10 @@ else
BUILD_TARGET=$1
fi
if [ -n "${RUN_NIGHTLY_BUILD}" ]
VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
if [ "${CI_BUILD_REF_NAME}" -eq "develop" ]
then
VERSION_NAME="devel"
else
if [[ ${CI_BUILD_TAG} =~ ^v([0-9]+\.[0-9]+\.[0-9]+)$ ]]
then
VERSION_NAME=${BASH_REMATCH[1]}
else
echo "Invalid version number ${CI_BUILD_TAG}"
exit
fi
VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD`
fi
##Which versions of external programs to use
......
......@@ -28,7 +28,7 @@ cmd /V:ON /E:ON /C "run_tests.bat" "${TARGET_DIR}" "${CI_PROJECT_DIR_WIN}"
# Exit now if unable to run tests
if [ $? -ne 0 ]; then
status = $?
status=$?
echo "One or several unit tests failed"
exit status
fi
......
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