remove more warnings in actions

also use matrix for test
EDmodel · Aug 22, 2024 · a3f2497 · a3f2497
1 parent 1a3be69
commit a3f2497
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 38 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,43 +25,17 @@ jobs:
         name: ed2-binary
         path: ED/build/ed_2.2-dbg
 
-  test-umbs-bg:
+  tests:
     needs: build
     runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Retrieve compiled binary
-      uses: actions/download-artifact@v4
-      with:
-        name: ed2-binary
-    - name: Install dependencies
-      run: sudo apt-get install -y --no-install-recommends gfortran libhdf5-openmpi-dev libopenmpi-dev
-    - name: Run ED2
-      working-directory: ./EDTS/
-      run: |
-        chmod +x "$GITHUB_WORKSPACE"/ed2-binary/ed_2.2-dbg
-        ./run-test.sh umbs.bg "$GITHUB_WORKSPACE/ed2-binary/ed_2.2-dbg"
+    strategy:
+      fail-fast: false
+      matrix:
+        name:
+          - umbs.bg
+          - tonzi
+          - tonzi.harvest
 
-  test-tonzi:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Retrieve compiled binary
-      uses: actions/download-artifact@v4
-      with:
-        name: ed2-binary
-    - name: Install dependencies
-      run: sudo apt-get install -y --no-install-recommends gfortran libhdf5-openmpi-dev libopenmpi-dev
-    - name: Run ED2
-      working-directory: ./EDTS/
-      run: |
-        chmod +x "$GITHUB_WORKSPACE"/ed2-binary/ed_2.2-dbg
-        ./run-test.sh tonzi "$GITHUB_WORKSPACE/ed2-binary/ed_2.2-dbg"
-
-  test-tonzi-harvest:
-    needs: build
-    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Retrieve compiled binary
@@ -73,5 +47,5 @@ jobs:
     - name: Run ED2
       working-directory: ./EDTS/
       run: |
-        chmod +x "$GITHUB_WORKSPACE"/ed2-binary/ed_2.2-dbg
-        ./run-test.sh tonzi.harvest "$GITHUB_WORKSPACE/ed2-binary/ed_2.2-dbg"
+        chmod +x "$GITHUB_WORKSPACE"/ed2-binary
+        ./run-test.sh ${{ matrix.name }} "$GITHUB_WORKSPACE/ed2-binary"
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -199,7 +199,7 @@ jobs:
       # this will update the README of the dockerhub repo
       - name: Docker Hub Description
         if: env.DOCKERHUB_README == 'true'
-        uses: peter-evans/dockerhub-description@v3
+        uses: peter-evans/dockerhub-description@v4
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}

diff --git a/Dockerfile.gnu b/Dockerfile.gnu
@@ -47,4 +47,4 @@ RUN apt-get update \
 WORKDIR /data
 COPY --from=build /ED2/ED/build/ed2 /usr/bin
 
-CMD /usr/bin/ed2
+CMD ["/usr/bin/ed2"]