From 4efb50cac5bcf7b11cc0fbc8d29b0be807db9631 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 21 Jun 2017 15:20:55 -0400 Subject: mmmhmmm --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 03713ca..ecb5e27 100644 --- a/setup.py +++ b/setup.py @@ -1 +1,2 @@ print("HELLO WORLD!") +print("FROM A PR!") -- cgit From 09f73feef769b5c585568de9fb9afc1804ee09a6 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 21 Jun 2017 15:49:32 -0400 Subject: mmmhmmm --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index ecb5e27..09f5fe4 100644 --- a/setup.py +++ b/setup.py @@ -1,2 +1,3 @@ print("HELLO WORLD!") print("FROM A PR!") +print("X2!") -- cgit From 8ce699ddf8865c986ee6235607b42698f397e5ae Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 21 Jun 2017 16:17:47 -0400 Subject: mmmhmmm --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 09f5fe4..4072727 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,4 @@ print("HELLO WORLD!") print("FROM A PR!") print("X2!") +print("blah.") -- cgit From 208aa350891bfab8ea5d96abf2cad75a24823b1b Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 21 Jun 2017 22:08:36 -0400 Subject: hmm --- .jenkins/install_conda.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 .jenkins/install_conda.sh diff --git a/.jenkins/install_conda.sh b/.jenkins/install_conda.sh new file mode 100755 index 0000000..96c1b39 --- /dev/null +++ b/.jenkins/install_conda.sh @@ -0,0 +1,3 @@ +#!/bin/bash -e +wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh +bash Miniconda3-latest-Linux-x86_64.sh -b -p ${HOME}/mc3 -- cgit From ef413bb8bf87931b3ca8e79eedfaf835c8311a71 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 21 Jun 2017 22:22:27 -0400 Subject: bleh --- Jenkinsfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7969b8f..2615849 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,10 +2,17 @@ pipeline { agent any stages { + stage('Bootstrap') { + steps { + sh '.jenkins/install_conda.sh' + sh 'export PATH=${HOME}/mc3/bin:$PATH' + sh 'python --version' + } + } stage('Build') { steps { echo 'Building..' - sh 'python setup.py install' + sh '${HOME}/mc3/bin/python setup.py install' } } stage('Test') { -- cgit From 86f82d78c591440ab0a242d2b18d00143a9982a3 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 21 Jun 2017 22:31:13 -0400 Subject: blargh --- .jenkins/install_conda.sh | 2 +- Jenkinsfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.jenkins/install_conda.sh b/.jenkins/install_conda.sh index 96c1b39..435ff21 100755 --- a/.jenkins/install_conda.sh +++ b/.jenkins/install_conda.sh @@ -1,3 +1,3 @@ #!/bin/bash -e wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -bash Miniconda3-latest-Linux-x86_64.sh -b -p ${HOME}/mc3 +bash Miniconda3-latest-Linux-x86_64.sh -b -p ${WORKSPACE}/mc3 diff --git a/Jenkinsfile b/Jenkinsfile index 2615849..2ebef0f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,8 @@ pipeline { stage('Bootstrap') { steps { sh '.jenkins/install_conda.sh' - sh 'export PATH=${HOME}/mc3/bin:$PATH' + sh 'PATH=${WORKSPACE}/mc3/bin:$PATH source activate root' + sh '${WORKSPACE}/mc3/bin/python --version' sh 'python --version' } } -- cgit From 2b0dce4e91e76bb4fc412243ec1cfe24bd04cdd8 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 21 Jun 2017 22:38:58 -0400 Subject: adsffas --- .jenkins/use_conda.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 .jenkins/use_conda.sh diff --git a/.jenkins/use_conda.sh b/.jenkins/use_conda.sh new file mode 100644 index 0000000..1c215f7 --- /dev/null +++ b/.jenkins/use_conda.sh @@ -0,0 +1 @@ +export PATH=${WORKSPACE}/mc3/bin:$PATH -- cgit From 81eb24bd179d7508a147f7bd5b896a598a69b126 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 21 Jun 2017 22:40:42 -0400 Subject: jajaka --- .jenkins/build.sh | 6 ++++++ Jenkinsfile | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 .jenkins/build.sh diff --git a/.jenkins/build.sh b/.jenkins/build.sh new file mode 100644 index 0000000..312e2ab --- /dev/null +++ b/.jenkins/build.sh @@ -0,0 +1,6 @@ +#!/bin/bash +source ${WORKSPACE}/.jenkins/use_conda.sh + +python --version + +python setup.py install diff --git a/Jenkinsfile b/Jenkinsfile index 2ebef0f..447f0a7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,15 +5,12 @@ pipeline { stage('Bootstrap') { steps { sh '.jenkins/install_conda.sh' - sh 'PATH=${WORKSPACE}/mc3/bin:$PATH source activate root' - sh '${WORKSPACE}/mc3/bin/python --version' - sh 'python --version' } } stage('Build') { steps { echo 'Building..' - sh '${HOME}/mc3/bin/python setup.py install' + sh '.jenkins/build.sh' } } stage('Test') { -- cgit From 9e98160d4927c93a00d233d7a799d4ecdf4392a5 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 21 Jun 2017 23:03:40 -0400 Subject: asdfafllf --- .jenkins/build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .jenkins/build.sh diff --git a/.jenkins/build.sh b/.jenkins/build.sh old mode 100644 new mode 100755 -- cgit From 3073779b0f6199b7f68196086079a4199eb33687 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 21 Jun 2017 23:32:15 -0400 Subject: sigh --- .jenkins/install_conda.sh | 6 ++++-- .jenkins/use_conda.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.jenkins/install_conda.sh b/.jenkins/install_conda.sh index 435ff21..6697166 100755 --- a/.jenkins/install_conda.sh +++ b/.jenkins/install_conda.sh @@ -1,3 +1,5 @@ #!/bin/bash -e -wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -bash Miniconda3-latest-Linux-x86_64.sh -b -p ${WORKSPACE}/mc3 +[ -d ${WORKSPACE}@tmp/mc3 ] && exit 0 + +wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh +bash Miniconda3-latest-Linux-x86_64.sh -b -p ${WORKSPACE}@tmp/mc3 diff --git a/.jenkins/use_conda.sh b/.jenkins/use_conda.sh index 1c215f7..c573d53 100644 --- a/.jenkins/use_conda.sh +++ b/.jenkins/use_conda.sh @@ -1 +1 @@ -export PATH=${WORKSPACE}/mc3/bin:$PATH +export PATH=${WORKSPACE}@tmp/mc3/bin:$PATH -- cgit