Skip to content

Commit

Permalink
[jenkins] Enable PythonSupport on all CIs
Browse files Browse the repository at this point in the history
  • Loading branch information
Thoemi09 committed Mar 4, 2024
1 parent c6ab64d commit 3983204
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ properties([
pipelineTriggers(publish ? [
upstream(
threshold: 'SUCCESS',
upstreamProjects: '/TRIQS/cpp2py/master,/TRIQS/h5/unstable'
upstreamProjects: '/TRIQS/cpp2py/unstable,/TRIQS/h5/unstable'
)
] : [])
])
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 3983204

Please sign in to comment.