Commit 7ba4a103 authored by Charles Deltel's avatar Charles Deltel
Browse files

Merge branch 'migration_gitlab' into 'master'

Migration from gforge.inria.fr to gitlab.inria.fr

See merge request !1
parents 63281f5b aa5e0068
......@@ -48,10 +48,7 @@ add_custom_target (delivery
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/delivery_compile.sh ${SILENT_MODE}
COMMAND echo "Creating release tag on git repository..."
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/git_tag_manager.sh -M ${gatb-core_VERSION_MAJOR} -m ${gatb-core_VERSION_MINOR} -p ${gatb-core_VERSION_PATCH} -t \"'new release: ${CPACK_INFO_BIN}'\"
COMMAND echo "Uploading binary on Inria Forge..."
COMMAND scp -q ${CMAKE_CURRENT_SOURCE_DIR}/build/${CPACK_URI_BIN} ${CPACK_SERVER_ADDRESS}:${CPACK_SERVER_DIR_BIN}
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/delivery_dump_system.sh ${CMAKE_CURRENT_SOURCE_DIR}/build/${CPACK_URI_BIN_INFO} ${CMAKE_VERSION} ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} ${CMAKE_CXX_FLAGS} ${LIBRARY_COMPILE_DEFINITIONS}
COMMAND scp -q ${CMAKE_CURRENT_SOURCE_DIR}/build/${CPACK_URI_BIN_INFO} ${CPACK_SERVER_ADDRESS}:${CPACK_SERVER_DIR_BIN}
COMMAND echo "Creating release on github..."
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/github_release_manager.sh -l ${GH_LOGIN} -t ${GH_TOKEN} -o ${GH_OWNER} -r ${GH_REPO} -d "v${CPACK_PACKAGE_VERSION}" -c create -m \"'new release: ${CPACK_INFO_BIN}'\"
COMMAND echo "Uploading binary on github..."
......@@ -64,10 +61,7 @@ add_custom_target (upload
COMMAND echo "Compiling library..."
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/delivery_compile.sh true
COMMAND echo "Uploading binary on Inria Forge..."
COMMAND scp -q ${CMAKE_CURRENT_SOURCE_DIR}/build/${CPACK_URI_BIN} ${CPACK_SERVER_ADDRESS}:${CPACK_SERVER_DIR_BIN}
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/delivery_dump_system.sh ${CMAKE_CURRENT_SOURCE_DIR}/build/${CPACK_URI_BIN_INFO} ${CMAKE_VERSION} ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} ${CMAKE_CXX_FLAGS} ${LIBRARY_COMPILE_DEFINITIONS}
COMMAND scp -q ${CMAKE_CURRENT_SOURCE_DIR}/build/${CPACK_URI_BIN_INFO} ${CPACK_SERVER_ADDRESS}:${CPACK_SERVER_DIR_BIN}
COMMAND echo "Uploading binary on github..."
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/github_release_manager.sh -l ${GH_LOGIN} -t ${GH_TOKEN} -o ${GH_OWNER} -r ${GH_REPO} -d "v${CPACK_PACKAGE_VERSION}" -c upload ${CMAKE_CURRENT_SOURCE_DIR}/build/${CPACK_URI_BIN}
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/github_release_manager.sh -l ${GH_LOGIN} -t ${GH_TOKEN} -o ${GH_OWNER} -r ${GH_REPO} -d "v${CPACK_PACKAGE_VERSION}" -c upload ${CMAKE_CURRENT_SOURCE_DIR}/build/${CPACK_URI_BIN_INFO}
......
......@@ -21,7 +21,8 @@ cat $git_config | grep --quiet "scm.gforge.inria.fr"
if [ $? -eq 1 ];then
echo "This Git repository is not targeting Inria Forge."
exit 2
echo "TODO_migration_gitlab: we do not stop however"
#exit 2
fi
......@@ -85,6 +85,13 @@ cmake -Wno-dev -DJENKINS_TAG=${BRANCH_TO_BUILD} -DJENKINS_GFORGE_USER=${INRIA_FO
#---------------------------------------------------------------
make -j 2 doc || error_code
make deploy-doc || error_code
###########################################################################
# TODO_migration_gitlab (ChD, 2021-07-15) :
# - this used to move the GATB doc to gforge.inria.ssh using scp and ssh
# (not possible any more)
# - move this doc elsewhere (gitlabpages?)
###########################################################################
################################################################
# END #
......
......@@ -60,8 +60,10 @@ cmake --version
[ `gcc -dumpversion` = 4.7 ] && { echo "GCC 4.7"; } || { echo "GCC version is not 4.7, we exit"; exit 1; }
JENKINS_TASK=test-suite-debian7-64bits-gcc-4.7
GIT_DIR=/builds/workspace/$JENKINS_TASK/gatb-core
JENKINS_TASK=test-suite-debian7-64bits-gcc-4.7-gitlab
JENKINS_WORKSPACE=/builds/workspace/$JENKINS_TASK/
GIT_DIR=$JENKINS_WORKSPACE/gatb-core
BUILD_DIR=/scratchdir/$JENKINS_TASK/gatb-core/build
rm -rf $BUILD_DIR
......@@ -79,15 +81,23 @@ make -j 2 || error_code
################################################################
# PACKAGING #
################################################################
# Upload bin bundle to the forge; source bundle is made by OSX Jenkins task
#-- Upload bin bundle as a build artifact
# -> bin bundle *-bin-Linux.tar.gz will be archived as a build artifact
# -> source package is handled by the osx task
if [ $? -eq 0 ] && [ "$INRIA_FORGE_LOGIN" != none ] && [ "$DO_NOT_STOP_AT_ERROR" != true ]; then
echo "Creating a binary archive... "
echo "N.B. this is NOT an official binary release"
make package
scp gatb-core-${BRANCH_TO_BUILD}-bin-Linux.tar.gz ${INRIA_FORGE_LOGIN}@scm.gforge.inria.fr:/home/groups/gatb-core/htdocs/ci-inria
pwd
ls -atlhrsF
#-- Move the generated bin bundle to the workspace (so that it can be uploaded as a Jenkins job artifact)
mv gatb-core-${BRANCH_TO_BUILD}-bin-Linux.tar.gz $JENKINS_WORKSPACE/
echo "Testing the distribution..."
gunzip gatb-core-${BRANCH_TO_BUILD}-bin-Linux.tar.gz
tar -xf gatb-core-${BRANCH_TO_BUILD}-bin-Linux.tar
tar -xzf $JENKINS_WORKSPACE/gatb-core-${BRANCH_TO_BUILD}-bin-Linux.tar.gz
cd gatb-core-${BRANCH_TO_BUILD}-bin-Linux
code_snippets=($(find ./examples -name "*1.cpp"))
......@@ -99,7 +109,7 @@ if [ $? -eq 0 ] && [ "$INRIA_FORGE_LOGIN" != none ] && [ "$DO_NOT_STOP_AT_ERROR"
# do some cleanup to save disk space
cd ..
rm -rf gatb-core-${BRANCH_TO_BUILD}-bin-Linux*
rm -rf gatb-core-${BRANCH_TO_BUILD}-bin-Linux/
fi
################################################################
......
......@@ -52,10 +52,11 @@ cmake --version
cd gatb-core
JENKINS_TASK=test-suite-macos-10.9.5-gcc-4.2.1
JENKINS_TASK=test-suite-macos-10.9.5-gcc-4.2.1-gitlab
GIT_DIR=/builds/workspace/$JENKINS_TASK/gatb-core
#BUILD_DIR=/scratchdir/$JENKINS_TASK/gatb-core/build
BUILD_DIR=$GIT_DIR/build #N.B. /scratchdir not yet mounted on the osx slave (ciosx)
JENKINS_WORKSPACE=$BUILD_DIR
rm -rf $BUILD_DIR
mkdir -p $BUILD_DIR
......@@ -76,11 +77,9 @@ if [ $? -eq 0 ] && [ "$INRIA_FORGE_LOGIN" != none ] && [ "$DO_NOT_STOP_AT_ERROR"
make package
echo "Creating a source archive... "
make package_source
scp gatb-core-${BRANCH_TO_BUILD}-bin-Darwin.tar.gz ${INRIA_FORGE_LOGIN}@scm.gforge.inria.fr:/home/groups/gatb-core/htdocs/ci-inria
scp gatb-core-${BRANCH_TO_BUILD}-Source.tar.gz ${INRIA_FORGE_LOGIN}@scm.gforge.inria.fr:/home/groups/gatb-core/htdocs/ci-inria
echo "Testing the distribution..."
gunzip gatb-core-${BRANCH_TO_BUILD}-bin-Darwin.tar.gz
tar -xf gatb-core-${BRANCH_TO_BUILD}-bin-Darwin.tar
tar -xzf gatb-core-${BRANCH_TO_BUILD}-bin-Darwin.tar.gz
cd gatb-core-${BRANCH_TO_BUILD}-bin-Darwin
code_snippets=($(find ./examples -name "*1.cpp"))
......@@ -91,7 +90,7 @@ if [ $? -eq 0 ] && [ "$INRIA_FORGE_LOGIN" != none ] && [ "$DO_NOT_STOP_AT_ERROR"
done
# do some cleanup to save disk space
cd ..
rm -rf gatb-core-${BRANCH_TO_BUILD}-bin-Darwin*
rm -rf gatb-core-${BRANCH_TO_BUILD}-bin-Darwin/
fi
################################################################
......@@ -121,4 +120,4 @@ ls ../test/db/ # default directory for test db
# VALGRIND CHECK #
################################################################
# not ready
\ No newline at end of file
# not ready
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