aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@users.noreply.github.com>2017-06-21 23:35:08 -0400
committerGitHub <noreply@github.com>2017-06-21 23:35:08 -0400
commitf5693383b0d78e9b59fa947e4e06a6064a9e4172 (patch)
tree7e65ca2cabf49daaebb7debf255b9817404066c6
parentf18cb02617f009bb3aee46a6c51b52573c939114 (diff)
parent3073779b0f6199b7f68196086079a4199eb33687 (diff)
downloadhello_world-f5693383b0d78e9b59fa947e4e06a6064a9e4172.tar.gz
Merge pull request #1 from jhunkeler/prtest
mmmhmmm
-rwxr-xr-x.jenkins/build.sh6
-rwxr-xr-x.jenkins/install_conda.sh5
-rw-r--r--.jenkins/use_conda.sh1
-rw-r--r--Jenkinsfile7
-rw-r--r--setup.py3
5 files changed, 21 insertions, 1 deletions
diff --git a/.jenkins/build.sh b/.jenkins/build.sh
new file mode 100755
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/.jenkins/install_conda.sh b/.jenkins/install_conda.sh
new file mode 100755
index 0000000..6697166
--- /dev/null
+++ b/.jenkins/install_conda.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+[ -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
new file mode 100644
index 0000000..c573d53
--- /dev/null
+++ b/.jenkins/use_conda.sh
@@ -0,0 +1 @@
+export PATH=${WORKSPACE}@tmp/mc3/bin:$PATH
diff --git a/Jenkinsfile b/Jenkinsfile
index 7969b8f..447f0a7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,10 +2,15 @@ pipeline {
agent any
stages {
+ stage('Bootstrap') {
+ steps {
+ sh '.jenkins/install_conda.sh'
+ }
+ }
stage('Build') {
steps {
echo 'Building..'
- sh 'python setup.py install'
+ sh '.jenkins/build.sh'
}
}
stage('Test') {
diff --git a/setup.py b/setup.py
index 03713ca..4072727 100644
--- a/setup.py
+++ b/setup.py
@@ -1 +1,4 @@
print("HELLO WORLD!")
+print("FROM A PR!")
+print("X2!")
+print("blah.")