From cfee998de70d0bf5780301fc0c75bdada57effbe Mon Sep 17 00:00:00 2001 From: absingh <absingh@mpi-cbg.de> Date: Thu, 18 May 2023 16:56:19 +0200 Subject: [PATCH] fixing Cpack --- .github/workflows/main.yml | 5 +++-- script/install_PETSC.sh | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ea9ef545b..704ebc11d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Install dependencies run: | - yum clean packages + dnf --refresh update yum install -y openssh-clients cmake wget git gcc-c++ gcc-gfortran python39 bzip2 diffutils zlib-devel yum-utils rpm-build ln -s /usr/bin/python3 /usr/bin/python - uses: actions/checkout@v3 @@ -66,7 +66,7 @@ jobs: printf " -DCPACK_RUN_INSTALL_DEPENDENCIES=ON" >> cmake_build_options; bash cmake_build_options; echo "Calling CPACK" - cpack -G RPM centos + cpack -G RPM centos if [ $? -ne 0 ]; then echo "Error creating package" exit 1 @@ -121,6 +121,7 @@ jobs: ln -s ./README.md README.txt cd build export DEP_PACKING=$HOME/openfpm_dependencies/${{ github.ref }} + ls $DEP_PACKING printf " -DCPACK_RUN_INSTALL_DEPENDENCIES=ON" >> cmake_build_options; tail cmake_build_options bash cmake_build_options; diff --git a/script/install_PETSC.sh b/script/install_PETSC.sh index 35be00e4b..7a8e52bd8 100755 --- a/script/install_PETSC.sh +++ b/script/install_PETSC.sh @@ -9,8 +9,7 @@ FC=$6 if [ -d "$1/PETSC" -a -f "$1/PETSC/include/petsc.h" ]; then echo "PETSC is already installed" - echo "BUT WE ARE REINSTALLING FOR CI" - #exit 0 + exit 0 fi # Detect gcc pr clang -- GitLab