Merge pull request #898 from gonuke/add_dd_on_merge

Add dd on merge
svalinn · Aug 19, 2023 · 3ffee08 · 3ffee08
2 parents 5090f1a + b865a4c
commit 3ffee08
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 57 deletions.
diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
@@ -10,6 +10,7 @@ on:
       - '.github/workflows/docker_publish.yml'
       - '.github/workflows/mac_build_test.yml'
       - '.github/workflows/windows_build_test.yml'
+      - '.github/workflows/linux_build_test_merge.yml'
       - '.github/workflows/housekeeping.yml'
       - '.github/workflows/changelog_test.yml'
       - 'CI/**'
@@ -21,6 +22,7 @@ on:
       - '.github/workflows/docker_publish.yml'
       - '.github/workflows/mac_build_test.yml'
       - '.github/workflows/windows_build_test.yml'
+      - '.github/workflows/linux_build_test_merge.yml'
       - '.github/workflows/housekeeping.yml'
       - '.github/workflows/changelog_test.yml'
       - 'CI/**'

diff --git a/.github/workflows/linux_build_test_merge.yml b/.github/workflows/linux_build_test_merge.yml
@@ -16,9 +16,10 @@ on:
       - 'CI/**'
       - 'doc/**'
 jobs:
-  build-dependency-img:
+  build-dependency-and-test-img:
     runs-on: ubuntu-latest
-
+    continue-on-error: true
+
     strategy:
       matrix:
         ubuntu_versions : [
@@ -33,6 +34,15 @@ jobs:
         moab_versions : [
          master,
         ]
+        double_down : [
+          OFF,
+        ]
+        include:
+          - ubuntu_versions: 22.04
+            compiler: gcc
+            hdf5_versions: 1.10.4
+            moab_versions : 5.3.0
+            double_down : ON
 
     name: Installing Dependencies
     steps:
@@ -59,68 +69,16 @@ jobs:
         uses: firehed/multistage-docker-build-action@v1
         with:
           repository: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}
-          stages: base, external_deps, hdf5
-          server-stage: moab
-          quiet: false
-          parallel: true
-          tag-latest-on-default: ${{ env.tag-latest-on-default }}
-          dockerfile: CI/Dockerfile
-          build-args: COMPILER=${{ matrix.compiler }}, UBUNTU_VERSION=${{ matrix.ubuntu_versions }}, HDF5_VERSION=${{ matrix.hdf5_versions }}, MOAB_BRANCH=${{ matrix.moab_versions }}
-
-  build-dagmc_test-img:
-    needs: [build-dependency-img]
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        ubuntu_versions : [
-          22.04,
-          ]
-        compiler : [
-          gcc,
-          ]
-        hdf5_versions : [
-         1.10.4,
-        ]
-        moab_versions : [
-         master,
-        ]
-
-    name: Installing DAGMC
-    steps:        
-      - name: default environment
-        run: |
-          echo "tag-latest-on-default=false" >> "$GITHUB_ENV"
-
-      - name: condition on trigger parameters
-        if: ${{ github.repository_owner == 'svalinn' && github.ref == 'refs/heads/develop' }}
-        run: |
-          echo "tag-latest-on-default=true" >> "$GITHUB_ENV"
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Build & test DAGMC in Docker image
-        uses: firehed/multistage-docker-build-action@v1
-        with:
-          repository: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler }}-ext-hdf5_${{ matrix.hdf5_versions }}-moab_${{ matrix.moab_versions }}
-          stages: moab, dagmc
+          stages: base, external_deps, hdf5, moab, dagmc
           server-stage: dagmc_test
           quiet: false
           parallel: true
           tag-latest-on-default: ${{ env.tag-latest-on-default }}
           dockerfile: CI/Dockerfile
-          build-args: COMPILER=${{ matrix.compiler }}, UBUNTU_VERSION=${{ matrix.ubuntu_versions }}, HDF5_VERSION=${{ matrix.hdf5_versions }}, MOAB_BRANCH=${{ matrix.moab_versions }}
+          build-args: COMPILER=${{ matrix.compiler }}, UBUNTU_VERSION=${{ matrix.ubuntu_versions }}, HDF5_VERSION=${{ matrix.hdf5_versions }}, MOAB_BRANCH=${{ matrix.moab_versions }}, double_down=${{ matrix.double_down }}
 
   push_stable_ci_img:
-    needs: [build-dagmc_test-img]
+    needs: [build-dependency-and-test-img]
     runs-on: ubuntu-latest
 
     strategy:

diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml
@@ -9,6 +9,7 @@ on:
     paths-ignore:
       - '.github/workflows/docker_publish.yml'
       - '.github/workflows/linux_build_test.yml'
+      - '.github/workflows/linux_build_test_merge.yml'
       - '.github/workflows/windows_build_test.yml'
       - '.github/workflows/housekeeping.yml'
       - '.github/workflows/changelog_test.yml'
@@ -21,6 +22,7 @@ on:
     paths-ignore:
       - '.github/workflows/docker_publish.yml'
       - '.github/workflows/linux_build_test.yml'
+      - '.github/workflows/linux_build_test_merge.yml'
       - '.github/workflows/windows_build_test.yml'
       - '.github/workflows/housekeeping.yml'
       - '.github/workflows/changelog_test.yml'

diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml
@@ -9,6 +9,7 @@ on:
     paths-ignore:
       - '.github/workflows/docker_publish.yml'
       - '.github/workflows/linux_build_test.yml'
+      - '.github/workflows/linux_build_test_merge.yml'
       - '.github/workflows/mac_build_test.yml'
       - '.github/workflows/housekeeping.yml'
       - '.github/workflows/changelog_test.yml'
@@ -21,6 +22,7 @@ on:
     paths-ignore:
       - '.github/workflows/docker_publish.yml'
       - '.github/workflows/linux_build_test.yml'
+      - '.github/workflows/linux_build_test_merge.yml'
       - '.github/workflows/mac_build_test.yml'
       - '.github/workflows/housekeeping.yml'
       - '.github/workflows/changelog_test.yml'

diff --git a/CI/Dockerfile b/CI/Dockerfile
@@ -207,6 +207,7 @@ FROM moab as dagmc
 # accessing gloabl ARGs in build stage
 ARG install_dir
 ARG build_dir
+ARG double_down
 ARG CXX
 ARG CC
 

diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
@@ -24,6 +24,7 @@ Next version
    * Introduced logger to better manage console output (#876)
    * Streamline CI to take advantage of better docker image management (#880, #896)
    * Move more CI from scripts to actions (#895)
+   * Add double-down to test-on-merge (#898)
 
 **Fixed:**
    * Patch to compile with Geant4 10.6 (#803)