diff --git a/.github/workflows/centos7-system-deps-build.yml b/.github/workflows/centos7-system-deps-build.yml index d06ce5499..4834f22d5 100644 --- a/.github/workflows/centos7-system-deps-build.yml +++ b/.github/workflows/centos7-system-deps-build.yml @@ -82,6 +82,11 @@ jobs: pip3 install wheel #Does not work in requirements pip3 install -r requirements-tests.txt + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.13 + with: + cmake-version: '3.22.x' + - name: Compile Boost uses: ./.github/workflows/compile-boost with: @@ -90,12 +95,8 @@ jobs: - name: Compile tbb uses: ./.github/workflows/compile-tbb with: - cmake: 'cmake3' + cmake: 'cmake' - - name: Setup cmake - uses: jwlawson/actions-setup-cmake@v1.13 - with: - cmake-version: '3.22.x' - name: Configure run: | @@ -118,17 +119,17 @@ jobs: source /etc/profile.d/modules.sh module load mpi cd _build - ctest3 -C Release --output-on-failure -L "unit|benders|lpnamer|medium" + ctest -C Release --output-on-failure -L "unit|benders|lpnamer|medium" - name: .tar.gz creation run: | cd _build - cpack3 -G TGZ + cpack -G TGZ - name: Installer .rpm creation run: | cd _build - cpack3 -G RPM + cpack -G RPM - id: create-single-file name: Single file .tar.gz creation diff --git a/docker/centos7-system-deps b/docker/centos7-system-deps index 753157e6c..44832868f 100644 --- a/docker/centos7-system-deps +++ b/docker/centos7-system-deps @@ -8,7 +8,7 @@ RUN yum install -y epel-release RUN \ yum install -y wget git epel-release redhat-lsb-core gcc gcc-c++ make centos-release-scl scl-utils &&\ - yum install -y cmake3 devtoolset-9 environment-modules rpm-build zlib-devel &&\ + yum install -y devtoolset-9 environment-modules rpm-build zlib-devel &&\ yum install -y jsoncpp-devel openmpi-devel doxygen graphviz &&\ yum install -y gtest-devel &&\ yum install -y install python3-devel && \