From 74375300ae530c7bb4408e92b483f4021affb399 Mon Sep 17 00:00:00 2001 From: Reimer Behrends Date: Thu, 5 Mar 2020 13:20:03 +0100 Subject: [PATCH] Support GAP kernels in notebooks. --- Jenkinsfile.notebooks | 20 +++++++++++++++++--- docker/Dockerfile | 2 ++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile.notebooks b/Jenkinsfile.notebooks index ecaaf23..b897d4d 100644 --- a/Jenkinsfile.notebooks +++ b/Jenkinsfile.notebooks @@ -3,10 +3,11 @@ node { def errors = 0 def stdenv = [ "PATH=${workspace}/local/bin:${env.PATH}", + "GAPROOT=${workspace}/gap", ] def nbtest = { String path -> try { - sh "${workspace}/nbtests/jupyter-julia ${path}" + sh "${workspace}/nbtests/jupyter-test ${path}" } catch (Exception err) { errors++ currentBuild.result = "SUCCESS" @@ -25,15 +26,28 @@ node { git url: "https://github.com/oscar-system/OSCARBinder", branch: "master" } + dir("gap") { + git url: "https://github.com/gap-system/gap" + branch: "stable-4.11" + } } stage("Build") { + sh "mkdir -p ${workspace}/local/bin" withEnv(stdenv) { dir("julia") { sh "make -j8" - sh "mkdir -p ${workspace}/local/bin" sh "ln -sf ${workspace}/julia/julia ${workspace}/local/bin" } } + withEnv(stdenv) { + dir("gap") { + sh "./autogen.sh" + sh "./configure --with-gc=julia --with-julia=${workspace}/julia" + sh "make -j8" + sh "test -d pkg || (make bootstrap-pkg-full && cd pkg && ../bin/BuildPackages.sh)" + sh "ln -sf ${workspace}/gap/bin/gap.sh ${workspace}/local/bin/gap" + } + } withEnv(stdenv) { sh "${workspace}/nbtests/install-oscar" } @@ -43,7 +57,7 @@ node { def notebooks = sh(script: "find ${workspace}/notebooks -name *.ipynb", returnStdout: true).trim().split("\\r?\\n") for (notebook in notebooks) { - nbtest notebook + nbtest notebook } if (errors > 0) { currentBuild.result = "FAILURE" diff --git a/docker/Dockerfile b/docker/Dockerfile index b528c92..c098188 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y \ gfortran \ git \ host \ + jq \ inetutils-ping \ inetutils-traceroute \ libboost-dev \ @@ -34,6 +35,7 @@ RUN apt-get update && apt-get install -y \ libxml-writer-perl \ libxml2-dev \ libxslt1-dev \ + libzmq3-dev \ locales \ make \ mercurial \