From 2c9febc2946a9efcb6e7439dcfccf88049929c65 Mon Sep 17 00:00:00 2001 From: Alexander Hampel Date: Tue, 27 Feb 2024 19:26:42 -0500 Subject: [PATCH] [build] use 3.2.x branch for jenkins --- .github/workflows/docker.yml | 4 +++- Docker/jenkins_ci_dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ebf6ad05..f635a9a3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,7 +2,9 @@ name: Create and publish Docker images on: push: { branches: [ 3.2.x ] } - pull_request: { branches: [ 3.2.x ] } + pull_request: + branches: [ 3.2.x ] + paths: ['Docker/**'] workflow_call: workflow_dispatch: diff --git a/Docker/jenkins_ci_dockerfile b/Docker/jenkins_ci_dockerfile index 717e2e52..cccac61f 100644 --- a/Docker/jenkins_ci_dockerfile +++ b/Docker/jenkins_ci_dockerfile @@ -4,19 +4,19 @@ ARG APPNAME=solid_dmft # install dfttools maxent hubbardI and HartreeFock # dft_tools -RUN cd / && git clone -b unstable --depth 1 https://github.com/TRIQS/dft_tools.git dft_tools.src \ +RUN cd / && git clone -b 3.2.x --depth 1 https://github.com/TRIQS/dft_tools.git dft_tools.src \ && mkdir -p dft_tools.build && cd dft_tools.build \ && cmake ../dft_tools.src \ && make -j4 install # hubbardI -RUN cd / && git clone -b unstable --depth 1 https://github.com/TRIQS/hubbardI.git hubbardI.src \ +RUN cd / && git clone -b 3.2.x --depth 1 https://github.com/TRIQS/hubbardI.git hubbardI.src \ && mkdir -p hubbardI.build && cd hubbardI.build \ && cmake ../hubbardI.src \ && make install # Hartree-Fock solver -RUN cd / && git clone -b unstable --depth 1 https://github.com/TRIQS/hartree_fock.git hartree.src \ +RUN cd / && git clone -b 3.2.x --depth 1 https://github.com/TRIQS/hartree_fock.git hartree.src \ && mkdir -p hartree.build && cd hartree.build \ && cmake ../hartree.src \ && make install