Merge branch 'cmake' of https://github.com/chrisryancombs/ISIS3 into cmake (d3e6b4c5) · Commits · aflab / astrogeology / ISIS3

Jenkinsfile

+5 −3

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ pipeline {
		label 'cmake'
		image 'chrisryancombs/docker_isis'
		args '''\
		-v /usgs/pkgs/local/v007:/usgs/pkgs/local/v007 \
		-v /usgs/cpkgs/isis3/data:/usgs/cpkgs/isis3/data \
		-v /usgs/cpkgs/isis3/testData:/usgs/cpkgs/isis3/testData\
		'''
		@@ -19,14 +18,17 @@ pipeline {
		stage('Config') {
		steps {
		sh """
		conda env create -n isis -f environment.yml
		source activate isis
		mkdir -p ./install ./build && cd build
		cmake -GNinja -DCMAKE_INSTALL_PREFIX=../install -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../isis \
		cmake -GNinja -DJP2KFLAG=OFF -DCMAKE_INSTALL_PREFIX=../install -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../isis \
		"""
		}
		}
		stage('Build') {
		steps {
		sh """
		export PATH="${PATH}:${ISISROOT}/bin:/opt/conda/envs/isis/bin"
		set +e
		cd build
		ninja -j8 && ninja install
		@@ -36,7 +38,7 @@ pipeline {
		stage('Test'){
		steps {
		sh """
		export PATH="${PATH}:${ISISROOT}/bin"
		export PATH="${PATH}:${ISISROOT}/bin:/opt/conda/envs/isis/bin"
		set +e
		cd build
		ctest -j8 -R _unit_

+1 −0

Original line number	Diff line number	Diff line
		@@ -66,4 +66,5 @@ dependencies:
		- qwt
		- tnt==126=0
		- xalan-c==1.11
		- x264==20131218
		prefix: /scratch/anaconda3/envs/isis