From 398320480d171e865713d0f3536c825d55b8a0bc Mon Sep 17 00:00:00 2001
From: Thomas Hahn <thomas.hahn01@gmail.com>
Date: Mon, 4 Mar 2024 10:57:28 -0500
Subject: [PATCH] [jenkins] Enable PythonSupport on all CIs

---
 .github/workflows/build.yml | 2 +-
 Dockerfile.build            | 2 +-
 Jenkinsfile                 | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69ba767df..933e12f37 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -102,7 +102,7 @@ jobs:
         CXX: ${{ matrix.cxx }}
         LIBRARY_PATH: /usr/local/opt/llvm/lib
       run: |
-        mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/install
+        mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/install -DPythonSupport=ON
         make -j2 || make -j1 VERBOSE=1
 
     - name: Test nda
diff --git a/Dockerfile.build b/Dockerfile.build
index 14d217ca6..0767a92a7 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -21,6 +21,6 @@ USER build
 ARG BUILD_ID
 ARG CMAKE_ARGS
 ARG NCORES=4
-RUN cmake $SRC/$APPNAME -DCMAKE_INSTALL_PREFIX=$INSTALL -DCLANG_OPT="$CXXFLAGS" $CMAKE_ARGS && make -j$NCORES || make -j1 VERBOSE=1
+RUN cmake $SRC/$APPNAME -DCMAKE_INSTALL_PREFIX=$INSTALL -DCLANG_OPT="$CXXFLAGS" $CMAKE_ARGS -DPythonSupport=ON && make -j$NCORES || make -j1 VERBOSE=1
 USER root
 RUN make install
diff --git a/Jenkinsfile b/Jenkinsfile
index 55765b47a..3a8a994ee 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ properties([
   pipelineTriggers(publish ? [
     upstream(
       threshold: 'SUCCESS',
-      upstreamProjects: '/TRIQS/cpp2py/master,/TRIQS/h5/unstable'
+      upstreamProjects: '/TRIQS/cpp2py/unstable,/TRIQS/h5/unstable'
     )
   ] : [])
 ])
@@ -86,11 +86,12 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
           "LD_LIBRARY_PATH=$hdf5/lib",
           "PYTHONPATH=$installDir/lib/python3.9/site-packages",
           "CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs",
+          "VIRTUAL_ENV=$venv",
           "OMP_NUM_THREADS=2"]) {
         deleteDir()
         sh "python3 -m venv $venv"
         sh "pip3 install -U -r $srcDir/requirements.txt"
-        sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir"
+        sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir -DPythonSupport=ON"
         sh "make -j2 || make -j1 VERBOSE=1"
         catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') { try {
           sh "make test CTEST_OUTPUT_ON_FAILURE=1"