Move duplication to separate steps

Author: tkoskela

.github/workflows/cmake.yml

@@ -79,81 +79,71 @@ jobs:
               omp: "on"
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
+    - uses: actions/checkout@v4
 
    # Enable tmate debugging of manually-triggered workflows if the input option was provided
     - name: Setup tmate session
       uses: mxschmitt/action-tmate@v3
       if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 
+    - name: Prepare ccache timestamp
+      id: ccache_cache_timestamp
+      run: echo "{date_and_time}={$(date +'%Y-%m-%d-%H;%M;%S')}" >> $GITHUB_OUTPUT
+    - name: Set ccache cache directory
+      shell: bash
+      run: echo "CCACHE_DIR=${{runner.workspace}}/.ccache" >> "${GITHUB_ENV}"
+    - name: Cache ccache files
+      uses: actions/cache@v3
+      with:
+        path: ${{runner.workspace}}/.ccache
+        key: ${{matrix.os}}-${{matrix.cxx}}-${{matrix.mpi}}-${{matrix.omp}}-${{ steps.ccache_cache_timestamp.outputs.date_and_time }}
+        restore-keys: |
+          ${{ matrix.os }}-${{ matrix.cxx }}-${{ matrix.mpi }}-${{ matrix.omp }}
+          ${{ matrix.os }}-${{ matrix.cxx }}-${{ matrix.mpi }}
+          ${{ matrix.os }}-${{ matrix.cxx }}
+          ${{ matrix.os }}
+
+#    - name: Clear ccache
+#      run: ccache --clear
+
     - name: Install Dependencies on Ubunutu
       if: ${{ contains(matrix.os, 'ubuntu') }}
       run: |
         sudo apt update
         sudo apt install openmpi-bin libopenmpi-dev ccache graphviz libeigen3-dev libspdlog-dev libtiff-dev libcfitsio-dev libbenchmark-dev libboost-all-dev libyaml-cpp-dev
-        git clone https://github.com/catchorg/Catch2.git -b v3.4.0
-        mkdir Catch2/build
-        cd Catch2/build
-        cmake .. -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local
-        make -j$(nproc --ignore 1) install
-        cd -
-        wget --no-check-certificate --no-verbose http://www.fftw.org/fftw-3.3.10.tar.gz -O- | tar --no-same-owner -xz;
-        cd fftw-3.3.10
-        ./configure --prefix=${{github.workspace}}/local --enable-shared
-        make -j$(nproc --ignore 1) install CFLAGS=-fPIC
-        # Fix bug in FFT3 (cf. https://github.com/FFTW/fftw3/issues/332)
-        sed -i -e 's/^.*FFTW3LibraryDepends.cmake.*$//1' ${{github.workspace}}/local/lib*/cmake/*/FFTW3Config.cmake
-        cd -
 
     - name: Install Dependencies on MacOS
       if: ${{ contains(matrix.os, 'macos') }}
       run: |
         brew install gcc libtiff open-mpi libomp eigen libyaml ccache cfitsio boost yaml-cpp
         echo "CMAKE_PREFIX_PATH=/opt/homebrew/opt/libomp" >> $GITHUB_ENV
         echo "/opt/homebrew/opt/ccache/libexec" >> $GITHUB_PATH
-        git clone https://github.com/catchorg/Catch2.git -b v3.4.0
+
+    - name: Checkout Catch2
+      uses: actions/checkout@v4
+      with:
+        repository: catchorg/Catch2.git
+        path: Catch2
+        ref: v3.4.0
+
+    - name: Build Catch2
+      run: |
         mkdir Catch2/build
         cd Catch2/build
         cmake .. -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local
         make -j$(nproc --ignore 1) install
-        cd -
+
+    - name: Install FFTW
+      run: |
         wget --no-check-certificate --no-verbose http://www.fftw.org/fftw-3.3.10.tar.gz -O- | tar --no-same-owner -xz;
         cd fftw-3.3.10
         ./configure --prefix=${{github.workspace}}/local --enable-shared
         make -j$(nproc --ignore 1) install CFLAGS=-fPIC
         # Fix bug in FFT3 (cf. https://github.com/FFTW/fftw3/issues/332)
         sed -i -e 's/^.*FFTW3LibraryDepends.cmake.*$//1' ${{github.workspace}}/local/lib*/cmake/*/FFTW3Config.cmake
-        cd -
-
-    - name: Select Python 3.10
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      run: echo "{date_and_time}={$(date +'%Y-%m-%d-%H;%M;%S')}" >> $GITHUB_OUTPUT
-    - name: Set ccache cache directory
-      shell: bash
-      run: echo "CCACHE_DIR=${{runner.workspace}}/.ccache" >> "${GITHUB_ENV}"
-    - name: Cache ccache files
-      uses: actions/cache@v3
-      with:
-        path: ${{runner.workspace}}/.ccache
-        key: ${{matrix.os}}-${{matrix.cxx}}-${{matrix.mpi}}-${{matrix.omp}}-${{ steps.ccache_cache_timestamp.outputs.date_and_time }}
-        restore-keys: |
-          ${{ matrix.os }}-${{ matrix.cxx }}-${{ matrix.mpi }}-${{ matrix.omp }}
-          ${{ matrix.os }}-${{ matrix.cxx }}-${{ matrix.mpi }}
-          ${{ matrix.os }}-${{ matrix.cxx }}
-          ${{ matrix.os }}
-
-#    - name: Clear ccache
-#      run: ccache --clear
 
     - name: Checkout SOPT
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: astro-informatics/sopt.git
         path: sopt
@@ -168,7 +158,6 @@ jobs:
         cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -Ddompi=${{matrix.mpi}} -Dopenmp=${{matrix.omp}}
         make -j$(nproc --ignore 1) install
 
-
     - name: Install
       # Build your program with the given configuration
       run: |