Merge pull request #190 from cyclus/tag-build-arg

cyclus · Feb 11, 2024 · 95b0445 · 95b0445
2 parents 77fcf6c + 134c6c5
commit 95b0445
Show file tree

Hide file tree

Showing 7 changed files with 174 additions and 96 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -5,22 +5,25 @@ on:
   workflow_dispatch:
   pull_request:
     paths-ignore:
-      - '.github/workflows/build_test_publish.yml'
-      - 'docker/**'
+      - '.github/workflows/publish_latest.yml'
+      - '.github/workflows/publish_release.yml'
       - 'doc/**'
       - 'CHANGELOG.rst'
   push:
     paths-ignore:
-      - '.github/workflows/build_test_publish.yml'
-      - 'docker/**'
+      - '.github/workflows/publish_latest.yml'
+      - '.github/workflows/publish_release.yml'
       - 'doc/**'
       - 'CHANGELOG.rst'
 
 jobs:
   build-and-test:
-
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: read
+      packages: write
+      pull-requests: write
+
     strategy:
       fail-fast: false
       matrix:
@@ -34,30 +37,43 @@ jobs:
         ]
         cycamore_tag: [
           latest,
+          stable,
         ]
 
-    container:
-      image: ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:${{matrix.cycamore_tag}}
-
     steps:
       - name: Checkout Cymetric
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install Cymetric Apt Dependencies
-        if: matrix.pkg_mgr == 'apt'
-        run: |
-          apt update --fix-missing && apt install -y python3-pip python3-pytest
-      
-      - name: Install Cymetric Conda Dependencies
-        if: matrix.pkg_mgr == 'conda'
-        run: |
-          mamba install -y pip pytest
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - name: Build Cymetric
-        run: |
-          python -m pip install --target $(python -m site --user-site) .
+      - name: Build and Test Cymetric
+        id: build-cymetric
+        continue-on-error: true
+        uses: docker/build-push-action@v5
+        with:
+          cache-from: type=registry,ref=ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:ci-layer-cache
+          cache-to: type=registry,ref=ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:ci-layer-cache,mode=max
+          file: docker/Dockerfile
+          build-args: |
+            pkg_mgr=${{ matrix.pkg_mgr }}
+            ubuntu_version=${{ matrix.ubuntu_versions }}
+            cycamore_tag=${{ matrix.cycamore_tag }}
 
-      - name: Cymetric Tests
-        run: |
-          export PYTHONPATH=$(find /root/.local/lib -type d -name 'cyclus-*-*.egg' -print -quit)
-          cd tests && python -m pytest
+      - name: PR Comment
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          comment_tag: ${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}_${{ matrix.cycamore_tag }}
+          message: |
+            ## Build statuses using cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}:${{ matrix.cycamore_tag }}
+            - Cymetric: ${{steps.build-cymetric.outcome == 'success' && '*Success* :white_check_mark:' || 
+                steps.build-cymetric.outcome == 'failure' && '**Failure** :x:' || 
+                '**Skipped due to upstream failure** :warning:'}}
diff --git a/.github/workflows/build_test_publish.yml b/.github/workflows/build_test_publish.yml
diff --git a/.github/workflows/changelog_test.yml b/.github/workflows/changelog_test.yml
@@ -22,7 +22,7 @@ jobs:
           git --version
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - run: |
           git config --global --add safe.directory ${GITHUB_WORKSPACE}

diff --git a/.github/workflows/publish_latest.yml b/.github/workflows/publish_latest.yml
@@ -0,0 +1,63 @@
+name: Publish Latest Cymetric
+
+on:
+  # allows us to run workflows manually
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - '.github/workflows/publish_latest.yml'
+  push:
+    branches:
+      - main
+
+jobs:
+  build-cymetric-and-push:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ubuntu_versions : [
+          20.04,
+          22.04,
+        ]
+        pkg_mgr : [
+          apt,
+          conda,
+        ]
+
+    name: Build, Test, Publish
+    steps:
+      - name: Tag as ci-image-cache by default
+        run: |
+          echo "tag=ci-image-cache" >> "$GITHUB_ENV"
+
+      - name: Tag as latest
+        if: ${{ github.repository_owner == 'cyclus' && github.ref == 'refs/heads/main' }}
+        run: |
+          echo "tag=latest" >> "$GITHUB_ENV"
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and Test Cymetric
+        uses: docker/build-push-action@v5
+        with:
+          cache-from: type=registry,ref=ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:ci-layer-cache
+          cache-to: type=registry,ref=ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:ci-layer-cache,mode=max
+          file: docker/Dockerfile
+          push: true
+          tags: ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:${{ env.tag }}
+          build-args: |
+            pkg_mgr=${{ matrix.pkg_mgr }}
+            ubuntu_version=${{ matrix.ubuntu_versions }}
+            cycamore_tag=latest
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -0,0 +1,65 @@
+name: Publish Stable Cymetric
+
+on:
+  release:
+    types: [released]
+
+jobs:
+  build-and-test-for-release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ubuntu_versions : [
+          20.04,
+          22.04,
+        ]
+        pkg_mgr : [
+          apt,
+          conda
+        ]
+
+    name: Building, Test, Publish
+    steps:
+      - name: Tag as ci-image-cache
+        run: |
+          echo "version_tag=ci-image-cache" >> "$GITHUB_ENV"
+          echo "stable_tag=ci-image-cache" >> "$GITHUB_ENV"
+
+      - name: Tag as stable
+        if: ${{ github.repository_owner == 'cyclus' }}
+        run: |
+          echo "version_tag=${{ github.ref_name }}" >> "$GITHUB_ENV"
+          echo "stable_tag=stable" >> "$GITHUB_ENV"
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Checkout Cymetric
+        uses: actions/checkout@v4
+
+      - name: Build and Test Cymetric
+        uses: docker/build-push-action@v5
+        with:
+          cache-from: type=registry,ref=ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:ci-layer-cache
+          cache-to: type=registry,ref=ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:ci-layer-cache,mode=max
+          file: docker/Dockerfile
+          push: true
+          tags: |
+            ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:${{ env.version_tag }}
+            ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:${{ env.stable_tag }}
+          build-args: |
+            pkg_mgr=${{ matrix.pkg_mgr }}
+            ubuntu_version=${{ matrix.ubuntu_versions }}
+            cycamore_tag=stable
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,7 +4,7 @@ cymetric Change Log
 
 .. current developments
 **Added:**
-* GitHub workflows for CI (#188)
+* GitHub workflows for CI (#188, #190)
 
 **Changed**
 * Converted test suite from nose to pytest (#188)

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,15 +1,9 @@
 ARG pkg_mgr=apt
 ARG ubuntu_version=22.04
+ARG cycamore_tag=stable
 
-FROM ghcr.io/cyclus/cycamore_${ubuntu_version}_${pkg_mgr}/cycamore as cycamore
+FROM ghcr.io/cyclus/cycamore_${ubuntu_version}_${pkg_mgr}/cycamore:${cycamore_tag} as cymetric
 
-FROM cycamore as apt-deps
-RUN apt update --fix-missing && apt install -y python3-pip python3-pytest
-
-FROM cycamore as conda-deps
-RUN mamba install -y pip pytest
-
-FROM ${pkg_mgr}-deps as cymetric
 COPY . /cymetric
 WORKDIR /cymetric
 RUN python -m pip install --target $(python -m site --user-site) .