Merge pull request #895 from gonuke/remove_scripts

Remove CI support scripts

.github/workflows/changelog_test.yml

@@ -5,13 +5,11 @@ on:
   workflow_dispatch:
   pull_request:
 
-
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   changelog_update:
-    if: ${{ github.event_name == 'pull_request' }}
     runs-on: ubuntu-latest
     container:
       image: alpine:3.14
@@ -23,10 +21,18 @@ jobs:
           apk add --no-cache bash git openssh
           git --version
 
-      - name: Checkout repository and housekeeping
+      - name: Checkout repository
         uses: actions/checkout@v3
+
       - run: |
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
           cd $GITHUB_WORKSPACE
-          CI/scripts/changelog_test.sh
+          git remote add svalinn https://github.com/svalinn/DAGMC.git
+          git fetch svalinn
+          change=`git diff svalinn/develop -- doc/CHANGELOG.rst | wc -l`
+          git remote remove svalinn
+          if [ $change -eq 0 ]; then 
+            echo "doc/Changelog.rst has not been updated"
+            exit 1 
+          fi
 

.github/workflows/housekeeping.yml

@@ -27,4 +27,15 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE
           git config --global --add safe.directory /__w/DAGMC/DAGMC
-          CI/scripts/housekeeping.sh
+          find src/ \( -name "*.hpp" -o -name "*.cpp" -o -name "*.hh" -o -name "*.cc" -o -name "*.h" \) \
+              \( -not -path "src/gtest*" -not -path "src/mcnp/mcnp?/Source/*" -not -path "src/pyne*" \)  \
+              -exec clang-format -style=file -i {} \;
+          clang_diffs=`git status --porcelain`
+          if [ -z "${clang_diffs}" ]; then
+            echo "Style guide checker passed!"
+          else
+            echo "ERROR: Style guide checker failed. Please run clang-format."
+            echo "clang_diffs: ${clang_diffs}"
+            git diff
+            exit 1
+          fi

.github/workflows/linux_build_test.yml

@@ -11,8 +11,9 @@ on:
       - '.github/workflows/mac_build_test.yml'
       - '.github/workflows/windows_build_test.yml'
       - '.github/workflows/housekeeping.yml'
+      - '.github/workflows/changelog_test.yml'
       - 'CI/**'
-      - 'doc/CHANGELOG.rst'
+      - 'doc/**'
   push:
     branches:
       - develop
@@ -21,8 +22,9 @@ on:
       - '.github/workflows/mac_build_test.yml'
       - '.github/workflows/windows_build_test.yml'
       - '.github/workflows/housekeeping.yml'
+      - '.github/workflows/changelog_test.yml'
       - 'CI/**'
-      - 'doc/CHANGELOG.rst'
+      - 'doc/**'
 
 jobs:
   BuildTest:

.github/workflows/linux_build_test_merge.yml

@@ -1,4 +1,4 @@
-name: Linux Build/Test on Merge
+name: Test against MOAB master on PR merge
 
 on:
   # allows us to run workflows manually
@@ -8,59 +8,156 @@ on:
       - develop
     paths-ignore:
       - '.github/workflows/docker_publish.yml'
+      - '.github/workflows/linux_build_test.yml'
+      - '.github/workflows/mac_build_test.yml'
+      - '.github/workflows/windows_build_test.yml'
       - '.github/workflows/housekeeping.yml'
+      - '.github/workflows/changelog_test.yml'
       - 'CI/**'
-
+      - 'doc/**'
 jobs:
-  BuildTestMasterDev:
+  build-dependency-img:
     runs-on: ubuntu-latest
-    env:
-      hdf5_versions: ${{ matrix.hdf5_versions }}
-      hdf5_build_dir: hdf5_build_dir
 
     strategy:
       matrix:
         ubuntu_versions : [
-          18.04,
-          20.04,
+          22.04,
           ]
         compiler : [
           gcc,
-          clang,
           ]
         hdf5_versions : [
          1.10.4,
         ]
         moab_versions : [
-          master,
+         master,
         ]
 
-    container:
-      image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler }}-ext-hdf5_${{ matrix.hdf5_versions }}-moab_${{ matrix.moab_versions }}:stable
-
+    name: Installing Dependencies
     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: Installing Dependencies in Docker image
+        uses: firehed/multistage-docker-build-action@v1
         with:
-          submodules: recursive
+          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 }}
 
-      - name: Setup
-        run: |
-          echo "MOAB_VERSION=${{ matrix.moab_versions }}" >> $GITHUB_ENV
-          echo "COMPILER=${{ matrix.compiler }}" >> $GITHUB_ENV
-          echo "HDF5_VERSION=${{ matrix.hdf5_versions }}" >> $GITHUB_ENV
-          echo "REPO_SLUG=${GITHUB_REPOSITORY}" >> $GITHUB_ENV
-          echo "PULL_REQUEST=$(echo  $GITHUB_REF | cut -d"/" -f3)" >> $GITHUB_ENV
-          echo "DOUBLE_DOWN="OFF"" >> $GITHUB_ENV
-          echo "PYTHONPATH=/root/build_dir/moab/bld/pymoab/lib/python3.8/site-packages:${PYTHONPATH}" >> $GITHUB_ENV
-          ln -s $GITHUB_WORKSPACE /root/build_dir/DAGMC
-
-      - name: Building DAGMC
+  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: |
-          cd $GITHUB_WORKSPACE
-          CI/scripts/install.sh
+          echo "tag-latest-on-default=false" >> "$GITHUB_ENV"
 
-      - name: Testing DAGMC
+      - name: condition on trigger parameters
+        if: ${{ github.repository_owner == 'svalinn' && github.ref == 'refs/heads/develop' }}
         run: |
-          cd $GITHUB_WORKSPACE
-          CI/scripts/tests.sh
+          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
+          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 }}
+
+  push_stable_ci_img:
+    needs: [build-dagmc_test-img]
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ubuntu_versions : [
+          22.04,
+          ]
+        compiler : [
+          gcc,
+          ]
+        hdf5_versions : [
+         1.10.4,
+        ]
+        moab_versions : [
+         master,
+        ]
+
+    name: Pushing final images
+    steps:       
+      - name: Log in to the Container registry
+        if: ${{ github.repository_owner == 'svalinn' }}
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push Image as latest img
+        if: ${{ github.repository_owner == 'svalinn' && github.ref == 'refs/heads/develop' }}
+        uses: akhilerm/[email protected]
+        with:
+          src: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler }}-ext-hdf5_${{ matrix.hdf5_versions }}-moab_${{ matrix.moab_versions }}/dagmc:latest
+          dst: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}:latest
+
+      - name: Push Image as latest img
+        if: ${{ github.repository_owner == 'svalinn' && github.ref == 'refs/heads/develop' }}
+        uses: akhilerm/[email protected]
+        with:
+          src: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler }}-ext-hdf5_${{ matrix.hdf5_versions }}-moab_${{ matrix.moab_versions }}:latest
+          dst: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}:stable

.github/workflows/mac_build_test.yml

@@ -11,8 +11,9 @@ on:
       - '.github/workflows/linux_build_test.yml'
       - '.github/workflows/windows_build_test.yml'
       - '.github/workflows/housekeeping.yml'
+      - '.github/workflows/changelog_test.yml'
       - 'CI/**'
-      - 'doc/CHANGELOG.rst'
+      - 'doc/**'
 
   push:
     branches:
@@ -22,8 +23,9 @@ on:
       - '.github/workflows/linux_build_test.yml'
       - '.github/workflows/windows_build_test.yml'
       - '.github/workflows/housekeeping.yml'
+      - '.github/workflows/changelog_test.yml'
       - 'CI/**'
-      - 'doc/CHANGELOG.rst'
+      - 'doc/**'
 
   release:
     types: # This configuration does not affect the page_build event above

.github/workflows/windows_build_test.yml

@@ -11,8 +11,9 @@ on:
       - '.github/workflows/linux_build_test.yml'
       - '.github/workflows/mac_build_test.yml'
       - '.github/workflows/housekeeping.yml'
+      - '.github/workflows/changelog_test.yml'
       - 'CI/**'
-      - 'doc/CHANGELOG.rst'
+      - 'doc/**'
 
   push:
     branches:
@@ -22,8 +23,9 @@ on:
       - '.github/workflows/linux_build_test.yml'
       - '.github/workflows/mac_build_test.yml'
       - '.github/workflows/housekeeping.yml'
+      - '.github/workflows/changelog_test.yml'
       - 'CI/**'
-      - 'doc/CHANGELOG.rst'
+      - 'doc/**'
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}