parallel builds, removing unused github actions steps

NCAR · Jun 14, 2024 · eafa650 · eafa650
1 parent 2b39c7e
commit eafa650
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 25 deletions.
diff --git a/.github/workflows/fetch_content_integration.yml b/.github/workflows/fetch_content_integration.yml
@@ -41,20 +41,4 @@ jobs:
         run: docker build -t musica --build-arg MUSICA_GIT_TAG=${BRANCH_NAME} -f docker/${{ matrix.dockerfile }} .
 
       - name: Run tests in container
-        if: matrix.dockerfile != 'Dockerfile.coverage'
-        run: docker run --name test-container -t musica bash -c 'make test ARGS="--rerun-failed --output-on-failure -j8"'
-
-      - name: Run coverage tests in container
-        if: matrix.dockerfile == 'Dockerfile.coverage'
-        run: docker run --name test-container -t musica bash -c 'make coverage ARGS="--rerun-failed --output-on-failure -j8"'
-
-      - name: Copy coverage from container
-        if: matrix.dockerfile == 'Dockerfile.coverage'
-        run: docker cp test-container:build/coverage.info .
-
-      - name: Upload coverage report
-        if: matrix.dockerfile == 'Dockerfile.coverage'
-        uses: codecov/codecov-action@v3
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: coverage.info
+        run: docker run --name test-container -t musica bash -c 'make test ARGS="--rerun-failed --output-on-failure -j8"'
diff --git a/docker/Dockerfile.fortran-gcc.integration b/docker/Dockerfile.fortran-gcc.integration
@@ -39,7 +39,7 @@ RUN cd musica \
              -B build \
              -D CMAKE_BUILD_TYPE=Release \
     && cd build \
-    && make install
+    && make install -j
 
 # Build and install MUSICA
 RUN cd musica/fortran/test/fetch_content_integration \
@@ -49,7 +49,7 @@ RUN cd musica/fortran/test/fetch_content_integration \
         -D MUSICA_GIT_TAG=${MUSICA_GIT_TAG} \
         -D MUSICA_ENABLE_MICM=ON \
         -D MUSICA_ENABLE_TUVX=OFF \
-    && make
+    && make -j
 
 WORKDIR musica/fortran/test/fetch_content_integration/build
 RUN cp -r /musica/build/_deps/tuvx-src/examples/ .

diff --git a/docker/Dockerfile.fortran-intel b/docker/Dockerfile.fortran-intel
@@ -50,10 +50,9 @@ COPY . musica
 RUN cd musica \
     && cmake -S . \
              -B build \
-             -D MUSICA_ENABLE_TESTS=ON \
              -D CMAKE_BUILD_TYPE=Release \
     && cd build \
-    && make install
+    && make install -j
 
 # Set environment variables to build MUSICA-Fortran using intel compilers
 ENV CC=icx
@@ -66,7 +65,7 @@ RUN cd musica/fortran/test/fetch_content_integration \
         -D CMAKE_BUILD_TYPE=Release \
         -D CMAKE_EXE_LINKER_FLAGS="-Wl,--copy-dt-needed-entries" \
         -D MUSICA_GIT_TAG=${MUSICA_GIT_TAG} \
-    && make
+    && make -j
 
 WORKDIR musica/fortran/test/fetch_content_integration/build
 RUN cp -r /musica/build/_deps/tuvx-src/examples/ .

diff --git a/docker/Dockerfile.fortran-nvhpc b/docker/Dockerfile.fortran-nvhpc
@@ -50,10 +50,9 @@ COPY . musica
 RUN cd musica \
     && cmake -S . \
              -B build \
-             -D MUSICA_ENABLE_TESTS=ON \
              -D CMAKE_BUILD_TYPE=Release \
     && cd build \
-    && make install
+    && make install -j
 
 # Set environment variables to build MUSICA-Fortran using nvidia compilers
 ENV CXX=nvc++
@@ -66,7 +65,7 @@ RUN cd musica/fortran/test/fetch_content_integration \
         -D CMAKE_BUILD_TYPE=Release \
         -D CMAKE_EXE_LINKER_FLAGS="-Wl,--copy-dt-needed-entries" \
         -D MUSICA_GIT_TAG=${MUSICA_GIT_TAG} \
-    && make
+    && make -j
 
 WORKDIR musica/fortran/test/fetch_content_integration/build
 RUN cp -r /musica/build/_deps/tuvx-src/examples/ .