Merge pull request #431 from pdziekan/github-actions

GA: libmpdata++ install from marketplace
igfuw · Nov 18, 2021 · 89b4193 · 89b4193
2 parents 7c0575f + 1512a43
commit 89b4193
Showing 1 changed file with 13 additions and 27 deletions.
diff --git a/.github/workflows/test_libclouphxx.yml b/.github/workflows/test_libclouphxx.yml
@@ -53,10 +53,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    # Debugging with a ssh session
-#    - name: Setup tmate session
-#      uses: mxschmitt/action-tmate@v3
-
     - name: build libcloudph++
       uses: igfuw/libcloudphxx_build@v0.2-beta
       with:
@@ -136,31 +132,26 @@ jobs:
     - name: Decompress libcloudph++ build
       run: tar -xvf build.tar
 
+    # Debugging with a ssh session
+#    - name: Setup tmate session
+#      uses: mxschmitt/action-tmate@v3
+
     - name: Install libcloudph++
       run: sudo cmake --install build
 
-    - name: load UWLCM Singularity image
-      uses: igfuw/load_UWLCM_singularity_image@v0.1
-      with:
-        path: ${{ github.workspace }}/singularity_images
-
     - name: checkout libmpdata++ repo
       uses: actions/checkout@v2
       with:
         repository: igfuw/libmpdataxx
         path: libmpdataxx
 
-    - name: Configure libmpdata++ CMake
-      working-directory: ${{github.workspace}}/libmpdataxx/libmpdata++
-      run: singularity exec $SI cmake -B build -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/installed
-
-    - name: Build libmpdata++
-      working-directory: ${{github.workspace}}/libmpdataxx/libmpdata++
-      run: VERBOSE=1 singularity exec $SI cmake --build build 
-
     - name: Install libmpdata++
-      working-directory: ${{github.workspace}}/libmpdataxx/libmpdata++
-      run: sudo cmake --install build
+      uses: igfuw/libmpdataxx_install@v0.4
+      with:
+        build_type: ${{matrix.build_type}}
+        threads: 4
+        path: ${{ github.workspace }}/libmpdataxx/libmpdata++
+        install_prefix: ${{ github.workspace }}/installed
 
     - name: Configure kinematic_2D CMake
       working-directory: ${{github.workspace}}/models/kinematic_2D
@@ -178,9 +169,9 @@ jobs:
         cat Testing/Temporary/LastTest.log
 
     # Debugging with a ssh session on failure
-    - name: Setup tmate session
-      if: ${{ failure() }}
-      uses: mxschmitt/action-tmate@v3
+#    - name: Setup tmate session
+#      if: ${{ failure() }}
+#      uses: mxschmitt/action-tmate@v3
 
 
   parcel_test:
@@ -246,11 +237,6 @@ jobs:
       if: ${{matrix.debug_tests}}
       run: PYTHONPATH=${{ github.workspace }}/installed/usr/lib/python3/dist-packages singularity exec -B${{ github.workspace }}/installed $SI python3 -m pytest -s -v unit_test_debug
 
-    # Debugging with a ssh session on failure
-    - name: Setup tmate session
-      if: ${{ failure() }}
-      uses: mxschmitt/action-tmate@v3
-
   build_and_test_KiD-A:
     runs-on: ubuntu-20.04
     strategy: