update CI workflow

htool-ddm · Sep 7, 2023 · c484cd6 · c484cd6
1 parent 6a722aa
commit c484cd6
Showing 1 changed file with 31 additions and 33 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -5,10 +5,9 @@ name: CI
 # Controls when the action will run.
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
-  push:
-    branches: [main, develop]
+
   pull_request:
-    branches: [main, develop]
+    branches: [main]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -31,21 +30,21 @@ jobs:
             CXX_COMPILER: g++
             container: "ubuntu_gcc_openmpi"
             MPIEXEC_PREFLAGS: "--allow-run-as-root --oversubscribe"
-            USE_SANITIZER: Address""
-            ASAN_OPTIONS: "ASAN_OPTIONS=detect_leaks=0" # issue probably with openmpi
-            CMAKE_BUILD_TYPE: Release
-            DOCKER_OPTIONS: " "
+            USE_SANITIZER: ""
+            # ASAN_OPTIONS: "ASAN_OPTIONS=detect_leaks=0" # issue probably with openmpi
+            CMAKE_BUILD_TYPE: Debug
             CODE_COVERAGE: "OFF"
+            DOCKER_OPTIONS: "--cap-add SYS_PTRACE"
 
           - name: "Ubuntu OpenMPI clang++"
             CC_COMPILER: clang
             CXX_COMPILER: clang++
             container: "ubuntu_clang_openmpi"
             MPIEXEC_PREFLAGS: "--allow-run-as-root --oversubscribe"
             USE_SANITIZER: ""
-            CMAKE_BUILD_TYPE: Release
-            DOCKER_OPTIONS: " "
+            CMAKE_BUILD_TYPE: Debug
             CODE_COVERAGE: "OFF"
+            DOCKER_OPTIONS: "--cap-add SYS_PTRACE"
 
           - name: "Ubuntu MPICH g++"
             CC_COMPILER: gcc
@@ -70,27 +69,26 @@ jobs:
             CODE_COVERAGE: "OFF"
 
           # Hangs up on github
-          # - name: "Debian OpenMPI g++"
-          #   CC_COMPILER: gcc
-          #   CXX_COMPILER: g++
-          #   container: "debian_openmpi"
-          #   MPIEXEC_PREFLAGS: "--allow-run-as-root --oversubscribe"
-          #   USE_SANITIZER: "Address"
-          #   ASAN_OPTIONS: "ASAN_OPTIONS=detect_leaks=0" # issue probably with openmpi
-          #   CMAKE_BUILD_TYPE: Debug
-          #   DOCKER_OPTIONS: " "
-          #   CODE_COVERAGE: "OFF"
-          #   # DOCKER_OPTIONS: "--cap-add SYS_PTRACE"
-          # - name: "Debian OpenMPI clang++"
-          #   CC_COMPILER: clang
-          #   CXX_COMPILER: clang++
-          #   container: "debian_openmpi"
-          #   MPIEXEC_PREFLAGS: "--allow-run-as-root --oversubscribe"
-          #   USE_SANITIZER: ""
-          #   CMAKE_BUILD_TYPE: Debug
-          #   DOCKER_OPTIONS: " "
-          #   CODE_COVERAGE: "OFF"
-          # DOCKER_OPTIONS: "--cap-add SYS_PTRACE"
+          - name: "Debian OpenMPI g++"
+            CC_COMPILER: gcc
+            CXX_COMPILER: g++
+            container: "debian_gcc_openmpi"
+            MPIEXEC_PREFLAGS: "--allow-run-as-root --oversubscribe"
+            USE_SANITIZER: ""
+            # ASAN_OPTIONS: "ASAN_OPTIONS=detect_leaks=0" # issue probably with openmpi
+            CMAKE_BUILD_TYPE: Debug
+            CODE_COVERAGE: "OFF"
+            DOCKER_OPTIONS: "--cap-add SYS_PTRACE"
+
+          - name: "Debian OpenMPI clang++"
+            CC_COMPILER: clang
+            CXX_COMPILER: clang++
+            container: "debian_clang_openmpi"
+            MPIEXEC_PREFLAGS: "--allow-run-as-root --oversubscribe"
+            USE_SANITIZER: ""
+            CMAKE_BUILD_TYPE: Debug
+            CODE_COVERAGE: "OFF"
+            DOCKER_OPTIONS: "--cap-add SYS_PTRACE"
 
           - name: "Debian MPICH g++"
             CC_COMPILER: gcc
@@ -126,19 +124,19 @@ jobs:
     name: CI (${{ matrix.name }})
 
     # Steps represent a sequence of tasks that will be executed as part of the job
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - name: Checkout htool
         uses: actions/checkout@v3
         with:
           path: "htool"
+          # ref: 14d013835eceb940b9b51dd90462fe67834db777
           fetch-depth: 0 # to get tags
       - name: Checkout hpddm
         uses: actions/checkout@v3
         with:
-          repository: hpddm/hpddm
-          ref: d19056d0e3010b905fca5b73f5c48a766b8a042d
           path: "hpddm"
+          repository: hpddm/hpddm
+          ref: afb9562c9c6673d9ff760985b104ef8d4caa3621
 
       - name: Build tests
         run: |