Commit ee2811d8 authored by Matt Clarkson's avatar Matt Clarkson

Issue #5357: Fix formatting issues in .gitlab-ci.yml

parent a9f98283
...@@ -227,9 +227,7 @@ Continuous docs: ...@@ -227,9 +227,7 @@ Continuous docs:
- mv html niftk-${version}-docs - mv html niftk-${version}-docs
- tar cfj niftk-${version}-docs.tar.bz2 niftk-${version}-docs - tar cfj niftk-${version}-docs.tar.bz2 niftk-${version}-docs
- echo "API reference documentation generated:" - echo "API reference documentation generated:"
- "# Upload the tarball"
- scp niftk-${version}-docs.tar.bz2 jet:/cs/sys/www0/marine/html/cmic.cs.ucl.ac.uk/NifTK/docs - scp niftk-${version}-docs.tar.bz2 jet:/cs/sys/www0/marine/html/cmic.cs.ucl.ac.uk/NifTK/docs
- "# Extract the tarball and replace the old files"
- ssh jet "cd /cs/sys/www0/marine/html/cmic.cs.ucl.ac.uk/NifTK/docs ; - ssh jet "cd /cs/sys/www0/marine/html/cmic.cs.ucl.ac.uk/NifTK/docs ;
rm -rf niftk-master-docs.tar.bz2 master ; rm -rf niftk-master-docs.tar.bz2 master ;
tar xfj niftk-${version}-docs.tar.bz2 ; tar xfj niftk-${version}-docs.tar.bz2 ;
...@@ -237,8 +235,7 @@ Continuous docs: ...@@ -237,8 +235,7 @@ Continuous docs:
mv niftk-${version}-docs.tar.bz2 niftk-master-docs.tar.bz2 ; mv niftk-${version}-docs.tar.bz2 niftk-master-docs.tar.bz2 ;
find master -type f -exec chmod 644 {} \; ; find master -type f -exec chmod 644 {} \; ;
find master -type d -exec chmod 755 {} \; ; find master -type d -exec chmod 755 {} \; ;
chmod 644 niftk-master-docs.tar.bz2 chmod 644 niftk-master-docs.tar.bz2"
"
only: only:
- master - master
...@@ -323,7 +320,7 @@ Windows continuous clean up: ...@@ -323,7 +320,7 @@ Windows continuous clean up:
# Release build jobs # Release build jobs
########################################## ##########################################
#Ubuntu 18.04 release build: Ubuntu 18.04 release build:
stage: build stage: build
...@@ -493,7 +490,7 @@ Windows 32 bit release build: ...@@ -493,7 +490,7 @@ Windows 32 bit release build:
# Dummy test jobs to prevent that deploy job is preceded by clean job. # Dummy test jobs to prevent that deploy job is preceded by clean job.
#Ubuntu 18.04 release test: Ubuntu 18.04 release test:
stage: test stage: test
...@@ -602,9 +599,7 @@ Release docs: ...@@ -602,9 +599,7 @@ Release docs:
- mv html niftk-${version}-docs - mv html niftk-${version}-docs
- tar cfj niftk-${version}-docs.tar.bz2 niftk-${version}-docs - tar cfj niftk-${version}-docs.tar.bz2 niftk-${version}-docs
- echo "API reference documentation generated:" - echo "API reference documentation generated:"
- "# Upload the tarball"
- scp niftk-${version}-docs.tar.bz2 jet:/cs/sys/www0/marine/html/cmic.cs.ucl.ac.uk/NifTK/docs - scp niftk-${version}-docs.tar.bz2 jet:/cs/sys/www0/marine/html/cmic.cs.ucl.ac.uk/NifTK/docs
- "# Extract the tarball and replace the old files"
- ssh cmiclab "cd /cs/sys/www0/marine/html/cmic.cs.ucl.ac.uk/NifTK/docs ; - ssh cmiclab "cd /cs/sys/www0/marine/html/cmic.cs.ucl.ac.uk/NifTK/docs ;
rm niftk-latest-docs.tar.bz2 latest ; rm niftk-latest-docs.tar.bz2 latest ;
tar xfj niftk-${version}-docs.tar.bz2 ; tar xfj niftk-${version}-docs.tar.bz2 ;
...@@ -612,8 +607,7 @@ Release docs: ...@@ -612,8 +607,7 @@ Release docs:
find ${version}/ -type f -exec chmod 644 {} \; ; find ${version}/ -type f -exec chmod 644 {} \; ;
find ${version}/ -type d -exec chmod 755 {} \; ; find ${version}/ -type d -exec chmod 755 {} \; ;
ln -s niftk-${version}-docs.tar.bz2 niftk-latest-docs.tar.bz2 ; ln -s niftk-${version}-docs.tar.bz2 niftk-latest-docs.tar.bz2 ;
ln -s ${version} latest ln -s ${version} latest"
"
only: only:
- tags - tags
...@@ -622,7 +616,7 @@ Release docs: ...@@ -622,7 +616,7 @@ Release docs:
- linux, centos-7, release - linux, centos-7, release
#Ubuntu 18.04 release installer: Ubuntu 18.04 release installer:
stage: deploy stage: deploy
...@@ -637,7 +631,6 @@ Release docs: ...@@ -637,7 +631,6 @@ Release docs:
- cpack --config CPackConfig.cmake - cpack --config CPackConfig.cmake
- installer_file="niftk-${version}-${os_version}-x64.tar.bz2" - installer_file="niftk-${version}-${os_version}-x64.tar.bz2"
- mv niftk-${niftk_version_string}.tar.bz2 ${installer_file} - mv niftk-${niftk_version_string}.tar.bz2 ${installer_file}
- "# Upload the tarball"
- ssh cmiclab "mkdir -p /cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version" - ssh cmiclab "mkdir -p /cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version"
- scp ${installer_file} cmiclab:/cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version/ - scp ${installer_file} cmiclab:/cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version/
...@@ -663,10 +656,8 @@ CentOS 7 release installer: ...@@ -663,10 +656,8 @@ CentOS 7 release installer:
- cpack --config CPackConfig.cmake - cpack --config CPackConfig.cmake
- installer_file="niftk-${version}-${os_version}-x64.tar.bz2" - installer_file="niftk-${version}-${os_version}-x64.tar.bz2"
- mv niftk-${niftk_version_string}.tar.bz2 ${installer_file} - mv niftk-${niftk_version_string}.tar.bz2 ${installer_file}
- "# Upload the tarball"
- ssh cmiclab "mkdir -p /cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version" - ssh cmiclab "mkdir -p /cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version"
- scp ${installer_file} cmiclab:/cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version/ - scp ${installer_file} cmiclab:/cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version/
- "# Install on managed machines"
- install_prefix=/cs/research/medic/common2/paramedic/share/cmic/niftk-scientific/niftk-${niftk_version_string} - install_prefix=/cs/research/medic/common2/paramedic/share/cmic/niftk-scientific/niftk-${niftk_version_string}
- install_tmp_dir="${install_prefix}-tmp" - install_tmp_dir="${install_prefix}-tmp"
- ssh logno "mkdir ${install_tmp_dir} ; - ssh logno "mkdir ${install_tmp_dir} ;
...@@ -708,10 +699,8 @@ CentOS 6 release installer: ...@@ -708,10 +699,8 @@ CentOS 6 release installer:
- cpack --config CPackConfig.cmake - cpack --config CPackConfig.cmake
- installer_file="niftk-${version}-${os_version}-x64.tar.bz2" - installer_file="niftk-${version}-${os_version}-x64.tar.bz2"
- mv niftk-${niftk_version_string}.tar.bz2 ${installer_file} - mv niftk-${niftk_version_string}.tar.bz2 ${installer_file}
- "# Upload the tarball"
- ssh cmiclab "mkdir -p /cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version" - ssh cmiclab "mkdir -p /cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version"
- scp ${installer_file} cmiclab:/cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version/ - scp ${installer_file} cmiclab:/cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version/
- "# Install on cluster"
- install_prefix=/share/apps/cmic/niftk/niftk-${niftk_version_string} - install_prefix=/share/apps/cmic/niftk/niftk-${niftk_version_string}
- install_tmp_dir="${install_prefix}-tmp" - install_tmp_dir="${install_prefix}-tmp"
- mkdir ${install_tmp_dir} - mkdir ${install_tmp_dir}
...@@ -746,7 +735,6 @@ Mac release installer: ...@@ -746,7 +735,6 @@ Mac release installer:
- cpack --config CPackConfig.cmake - cpack --config CPackConfig.cmake
- installer_file="niftk-${version}-mac-10.10.dmg" - installer_file="niftk-${version}-mac-10.10.dmg"
- mv niftk-${niftk_version_string}.dmg ${installer_file} - mv niftk-${niftk_version_string}.dmg ${installer_file}
- "# Upload the installer image"
- ssh cmiclab "mkdir -p /cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version" - ssh cmiclab "mkdir -p /cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version"
- scp ${installer_file} cmiclab:/cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version/ - scp ${installer_file} cmiclab:/cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version/
...@@ -770,7 +758,6 @@ Windows release installer: ...@@ -770,7 +758,6 @@ Windows release installer:
- ${src_dir}/Utilities/NifTKReleaseDeploy.bat - ${src_dir}/Utilities/NifTKReleaseDeploy.bat
- installer_file="niftk-${version}-windows-7-x64.exe" - installer_file="niftk-${version}-windows-7-x64.exe"
- mv niftk-${niftk_version_string}.exe ${installer_file} - mv niftk-${niftk_version_string}.exe ${installer_file}
- "# Upload the installer image"
- ssh cmiclab "mkdir -p /cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version" - ssh cmiclab "mkdir -p /cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version"
- scp ${installer_file} cmiclab:/cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version/ - scp ${installer_file} cmiclab:/cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version/
...@@ -794,7 +781,6 @@ Windows 32 bit release installer: ...@@ -794,7 +781,6 @@ Windows 32 bit release installer:
- ${src_dir}/Utilities/NifTKReleaseDeploy.bat - ${src_dir}/Utilities/NifTKReleaseDeploy.bat
- installer_file="niftk-${version}-windows-7-x86.exe" - installer_file="niftk-${version}-windows-7-x86.exe"
- mv niftk-${niftk_version_string}.exe ${installer_file} - mv niftk-${niftk_version_string}.exe ${installer_file}
- "# Upload the installer image"
- ssh cmiclab "mkdir -p /cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version" - ssh cmiclab "mkdir -p /cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version"
- scp ${installer_file} cmiclab:/cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version/ - scp ${installer_file} cmiclab:/cs/research/medic/cmiclab/deploy/CMIC/NifTK/install/$version/
...@@ -809,7 +795,7 @@ Windows 32 bit release installer: ...@@ -809,7 +795,7 @@ Windows 32 bit release installer:
# Release clean up jobs # Release clean up jobs
########################################## ##########################################
#Ubuntu 18.04 release clean up: Ubuntu 18.04 release clean up:
stage: cleanup stage: cleanup
......
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