Merge pull request #17801 from marcfehling/cleanup

dealii · Oct 29, 2024 · d88af65 · d88af65
2 parents 9dca56a + 8ef31c9
commit d88af65
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 42 deletions.
diff --git a/.github/workflows/indent.yml b/.github/workflows/indent.yml
@@ -3,7 +3,7 @@ name: indent
 on: [push, pull_request]
 
 concurrency:
-  group: ${ {github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{github.event_name == 'pull_request'}}
 
 permissions:

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -10,7 +10,7 @@ on:
     - ready_for_review
 
 concurrency:
-  group: ${ {github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{github.event_name == 'pull_request'}}
 
 permissions:
@@ -184,25 +184,16 @@ jobs:
       run: |
         cd build
         make VERBOSE=1 -j2
-    - name: test
-      run: |
-        # Remove warning: "A high-performance Open MPI point-to-point
-        # messaging module was unable to find any relevant network
-        # interfaces."
-        export OMPI_MCA_btl_base_warn_component_unused='0'
-
-        cd build
-        make VERBOSE=1 -j2
-    - name: test
+    - name: test trilinos_tpetra
       run: |
         # Remove warning: "A high-performance Open MPI point-to-point
         # messaging module was unable to find any relevant network
         # interfaces."
         export OMPI_MCA_btl_base_warn_component_unused='0'
 
         cd build
-        make -j2 setup_tests
-        ctest --output-on-failure -j2 -VV -R "tpetra"
+        make -j2 setup_tests_trilinos_tpetra
+        ctest --output-on-failure -j2 -VV
 
   ############################
   # linux-debug-intel-oneapi #
@@ -468,12 +459,8 @@ jobs:
               -D DEAL_II_WITH_P4EST="ON" \
               -D DEAL_II_COMPONENT_EXAMPLES="ON" \
               ..
-        cat detailed.log
-    - name: archive detailed.log
-      uses: actions/upload-artifact@v4
-      with:
-        name: linux-cuda-clang-detailed.log
-        path: build/detailed.log
+    - name: print detailed.log
+      run: cat build/detailed.log
     - name: build deal.II
       run: |
         cd build

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -10,7 +10,7 @@ on:
     - ready_for_review
 
 concurrency:
-  group: ${ {github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{github.event_name == 'pull_request'}}
 
 permissions:
@@ -39,23 +39,25 @@ jobs:
         cmake --version
     - name: configure
       run: |
-        cmake -D CMAKE_BUILD_TYPE=Debug -D DEAL_II_CXX_FLAGS='-Werror' -D DEAL_II_EARLY_DEPRECATIONS=ON .
+        mkdir build
+        cd build
+        cmake -D CMAKE_BUILD_TYPE=Debug \
+              -D DEAL_II_CXX_FLAGS='-Werror' \
+              -D DEAL_II_EARLY_DEPRECATIONS=ON \
+              ..
     - name: print detailed.log
-      run: cat detailed.log
+      run: cat build/detailed.log
     - name: build
       run: |
+        cd build
         make VERBOSE=1 -j2
+    - name: test
+      run: |
+        cd build
         make -j2 \
           setup_tests_a-framework \
           setup_tests_quick_tests
         ctest --output-on-failure -j2 -VV
-    - name: upload CMakeConfigureLog
-      uses: actions/upload-artifact@v4
-      if: always()
-      continue-on-error: true
-      with:
-        name: osx-serial-CMakeConfigureLog.yaml
-        path: CMakeFiles/CMakeConfigureLog.yaml
 
   osx-parallel64:
     # MPI build using apple clang and 64 bit indices
@@ -86,21 +88,24 @@ jobs:
         cmake --version
     - name: configure
       run: |
-        CC=mpicc CXX=mpic++ cmake -D CMAKE_BUILD_TYPE=Debug -D DEAL_II_WITH_64BIT_INDICES=ON -D DEAL_II_CXX_FLAGS='-Werror' -D DEAL_II_EARLY_DEPRECATIONS=ON -D DEAL_II_WITH_MPI=on .
+        mkdir build
+        cd build
+        cmake -D CMAKE_BUILD_TYPE=Debug \
+              -D DEAL_II_WITH_64BIT_INDICES=ON \
+              -D DEAL_II_CXX_FLAGS='-Werror' \
+              -D DEAL_II_EARLY_DEPRECATIONS=ON \
+              -D DEAL_II_WITH_MPI=ON \
+              ..
     - name: print detailed.log
-      run: cat detailed.log
+      run: cat build/detailed.log
     - name: build
       run: |
+        cd build
         make VERBOSE=1 -j2
+    - name: test
+      run: |
+        cd build
         make -j2 \
           setup_tests_a-framework \
           setup_tests_quick_tests
         ctest --output-on-failure -j2 -VV
-    - name: upload CMakeConfigureLog
-      uses: actions/upload-artifact@v4
-      if: always()
-      continue-on-error: true
-      with:
-        name: osx-parallel64-CMakeConfigureLog.yaml
-        path: CMakeFiles/CMakeConfigureLog.yaml
-
diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml
@@ -10,9 +10,12 @@ on:
     - ready_for_review
 
 concurrency:
-  group: ${ {github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{github.event_name == 'pull_request'}}
 
+permissions:
+  contents: read
+
 jobs:
   tidy:
     name: tidy

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -10,7 +10,7 @@ on:
     - ready_for_review
 
 concurrency:
-  group: ${ {github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{github.event_name == 'pull_request'}}
 
 permissions: