From 7ae78e68efd8292336df36dadade075e167712e6 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Sun, 28 Jan 2024 22:09:53 -0600
Subject: [PATCH 01/28] update cycamore workflows to reflect cyclus PR

---
 .github/workflows/build_test.yml         | 27 ++++++-------
 .github/workflows/build_test_publish.yml | 49 +++++++++++++++++-------
 docker/Dockerfile                        |  9 +++--
 3 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index e6b63ae93..1a35b1806 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -18,7 +18,6 @@ on:
 
 jobs:
   build-and-test:
-
     runs-on: ubuntu-latest
 
     strategy:
@@ -35,23 +34,21 @@ jobs:
         cyclus_tag: [
           latest,
         ]
-    
-    container:
-      image: ghcr.io/cyclus/cyclus_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cyclus:${{matrix.cyclus_tag}}
 
     steps:
       - name: Checkout Cycamore
         uses: actions/checkout@v3
 
-      - name: Build Cycamore
-        run: |
-          python install.py --prefix=/root/.local --cyclus-root=/root/.local -j 2 --build-type=Release --core-version 99999.99999
-
-      - name: Cycamore Unit Tests
-        run: |
-          cycamore_unit_tests
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - name: Cycamore Python Tests
-        run: |
-          export PYTHONPATH=$(find /root/.local/lib -type d -name 'python*.*' -print -quit)/site-packages
-          cd tests && python -m pytest
+      - name: Build Cycamore
+        uses: docker/build-push-action@v5
+        with:
+          file: docker/Dockerfile
+          cache-from: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache
+          cache-to: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache,mode=max
+          build-args: |
+            pkg_mgr=${{ matrix.pkg_mgr }}
+            ubuntu_version=${{ matrix.ubuntu_versions }}
+            cyclus_tag=${{ matrix.cyclus_tag }}
diff --git a/.github/workflows/build_test_publish.yml b/.github/workflows/build_test_publish.yml
index fedd23c67..17e58895c 100644
--- a/.github/workflows/build_test_publish.yml
+++ b/.github/workflows/build_test_publish.yml
@@ -14,6 +14,9 @@ on:
 jobs:
   build-dependency-and-test-img:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     strategy:
       matrix:
@@ -25,17 +28,20 @@ jobs:
           apt,
           conda,
         ]
+        cyclus_tag : [
+          latest,
+        ]
 
     name: Installing Dependencies, Building Cycamore and Running Tests
     steps:
-      - name: default environment
+      - name: Tag as ci-image-cache
         run: |
-          echo "tag-latest-on-default=false" >> "$GITHUB_ENV"
+          echo "tag=ci-image-cache" >> "$GITHUB_ENV"
 
-      - name: condition on trigger parameters
+      - name: Tag as latest
         if: ${{ github.repository_owner == 'cyclus' && github.ref == 'refs/heads/main' }}
         run: |
-          echo "tag-latest-on-default=true" >> "$GITHUB_ENV"
+          echo "tag=latest" >> "$GITHUB_ENV"
 
       - name: Log in to the Container registry
         uses: docker/login-action@v2
@@ -47,14 +53,29 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Multi-Stage Build Action
-        uses: firehed/multistage-docker-build-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and Test Cycamore
+        uses: docker/build-push-action@v5
+        with:
+          cache-from: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache
+          cache-to: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache,mode=max
+          file: docker/Dockerfile
+          build-args: |
+            pkg_mgr=${{ matrix.pkg_mgr }}
+            ubuntu_version=${{ matrix.ubuntu_versions }}
+            cyclus_tag=${{ matrix.cyclus_tag }}
+
+      - name: Push Cycamore Image
+        uses: docker/build-push-action@v5
         with:
-          repository: ghcr.io/${{ github.repository_owner }}/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}
-          stages: cycamore
-          server-stage: cycamore-test
-          quiet: false
-          parallel: true
-          tag-latest-on-default: ${{ env.tag-latest-on-default }}
-          dockerfile: docker/Dockerfile
-          build-args: pkg_mgr=${{ matrix.pkg_mgr }}, ubuntu_version=${{ matrix.ubuntu_versions }}
\ No newline at end of file
+          cache-from: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache
+          file: docker/Dockerfile
+          target: cycamore
+          push: true
+          tags: ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:${{ env.tag }}
+          build-args: |
+            pkg_mgr=${{ matrix.pkg_mgr }}
+            ubuntu_version=${{ matrix.ubuntu_versions }}
+            cyclus_tag=latest
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8d2d33952..8682a7c59 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,16 +1,17 @@
 ARG pkg_mgr=apt
 ARG ubuntu_version=22.04
+ARG cyclus_tag=stable
 
-FROM ghcr.io/cyclus/cyclus_${ubuntu_version}_${pkg_mgr}/cyclus as cycamore
+FROM ghcr.io/cyclus/cyclus_${ubuntu_version}_${pkg_mgr}/cyclus:${cyclus_tag} as cycamore
 ARG make_cores=2
 
 COPY . /cycamore
 WORKDIR /cycamore
 
-RUN python install.py -j ${make_cores} --build-type=Release --core-version 99999.99999
+RUN python install.py -j ${make_cores} --build-type=Release --core-version 999999.999999
 
 FROM cycamore as cycamore-test
 RUN cycamore_unit_tests
 
-FROM cycamore as cycamore-pytest
-RUN cd tests && python -m pytest
+FROM cycamore-test as cycamore-pytest
+RUN cd tests && python -m pytest
\ No newline at end of file

From d3d4600ad545817878c550a717784a7cbc23b341 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Sun, 28 Jan 2024 22:29:08 -0600
Subject: [PATCH 02/28] add permissions

---
 .github/workflows/build_test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 1a35b1806..92fcd1e1d 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -19,6 +19,9 @@ on:
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     strategy:
       fail-fast: false

From 11fa27049fb203b324d0a984648b3305361490f7 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Sun, 28 Jan 2024 22:41:00 -0600
Subject: [PATCH 03/28] use new checkout version

---
 .github/workflows/build_test.yml         | 2 +-
 .github/workflows/build_test_publish.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 92fcd1e1d..76e681c2d 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout Cycamore
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
diff --git a/.github/workflows/build_test_publish.yml b/.github/workflows/build_test_publish.yml
index 17e58895c..70c8f81a1 100644
--- a/.github/workflows/build_test_publish.yml
+++ b/.github/workflows/build_test_publish.yml
@@ -51,7 +51,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

From d3b9b4cf39cd5a84db8f2e3a16ea9f01316b601e Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Sun, 28 Jan 2024 22:41:35 -0600
Subject: [PATCH 04/28] use new login-action version

---
 .github/workflows/build_test_publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_test_publish.yml b/.github/workflows/build_test_publish.yml
index 70c8f81a1..bdf1a0c8a 100644
--- a/.github/workflows/build_test_publish.yml
+++ b/.github/workflows/build_test_publish.yml
@@ -44,7 +44,7 @@ jobs:
           echo "tag=latest" >> "$GITHUB_ENV"
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

From b694c054b7fc41cca4579861e45893c52d572b5c Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Sun, 28 Jan 2024 22:43:35 -0600
Subject: [PATCH 05/28] update another version number

---
 .github/workflows/changelog_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/changelog_test.yml b/.github/workflows/changelog_test.yml
index 32cfe8671..9698acb8f 100644
--- 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}

From 953078eefd6e3f6f534bbb2caf20c9e914681a26 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:21:00 -0600
Subject: [PATCH 06/28] add downstream testing

---
 .github/workflows/build_test.yml | 49 ++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 76e681c2d..fd86117d1 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -39,13 +39,22 @@ jobs:
         ]
 
     steps:
-      - name: Checkout Cycamore
-        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: Checkout Cycamore
+        uses: actions/checkout@v4
+
       - name: Build Cycamore
+        id: build-cycamore
         uses: docker/build-push-action@v5
         with:
           file: docker/Dockerfile
@@ -55,3 +64,39 @@ jobs:
             pkg_mgr=${{ matrix.pkg_mgr }}
             ubuntu_version=${{ matrix.ubuntu_versions }}
             cyclus_tag=${{ matrix.cyclus_tag }}
+
+      - name: Checkout Cymetric
+        if: ${{ github.event_name == 'pull_request' && steps.build-cycamore.outcome == 'success' }}
+        uses: actions/checkout@v4
+        with:
+          repository: cyclus/cymetric
+          ref: tag-build-arg
+          path: $HOME/cymetric
+
+      - name: Build and Test Cymetric
+        if: ${{ github.event_name == 'pull_request' && steps.build-cycamore.outcome == 'success' }}
+        id: build-cymetric
+        continue-on-error: true
+        uses: docker/build-push-action@v5
+        with:
+          context: $HOME/cymetric
+          file: $HOME/cymetric/docker/Dockerfile
+          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
+          tags: ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:ci-image-cache
+          push: true
+          build-args: |
+            pkg_mgr=${{ matrix.pkg_mgr }}
+            ubuntu_version=${{ matrix.ubuntu_versions }}
+            cycamore_tag=ci-image-cache@${{ steps.build-cycamore.outputs.digest }}
+
+      - 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.cyclus_tag }}
+          message: |
+            ## Downstream Build Statuses using Cycamore ${{ github.ref }} on cyclus_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}:${{ matrix.cyclus_tag }}
+            - Cymetric: ${{needs.build-cymetric.outcome == 'success' && '*Success* :white_check_mark:' || 
+                steps.build-cymetric.outcome == 'failure' && '**Failure** :x:' || 
+                '**Skipped due to upstream failure** :warning:'}}

From 50ca712ffc742e066b17b325dcbcafb5711645b8 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:23:46 -0600
Subject: [PATCH 07/28] soft fail on cycamore fail

---
 .github/workflows/build_test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index fd86117d1..691d4360a 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -55,6 +55,7 @@ jobs:
 
       - name: Build Cycamore
         id: build-cycamore
+        continue-on-error: true
         uses: docker/build-push-action@v5
         with:
           file: docker/Dockerfile
@@ -97,6 +98,9 @@ jobs:
           comment_tag: ${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}_${{ matrix.cyclus_tag }}
           message: |
             ## Downstream Build Statuses using Cycamore ${{ github.ref }} on cyclus_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}:${{ matrix.cyclus_tag }}
+            - Cycamore: ${{steps.build-cycamore.outcome == 'success' && '*Success* :white_check_mark:' || 
+                steps.build-cycamore.outcome == 'failure' && '**Failure** :x:' || 
+                '**Skipped due to upstream failure** :warning:'}}
             - Cymetric: ${{needs.build-cymetric.outcome == 'success' && '*Success* :white_check_mark:' || 
                 steps.build-cymetric.outcome == 'failure' && '**Failure** :x:' || 
                 '**Skipped due to upstream failure** :warning:'}}

From 51c2df44579a63aa4de8c1fb44f879b5ee20b2ea Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:26:56 -0600
Subject: [PATCH 08/28] add release workflow

---
 .github/workflows/publish_release.yml | 79 +++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 .github/workflows/publish_release.yml

diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
new file mode 100644
index 000000000..1253d3958
--- /dev/null
+++ b/.github/workflows/publish_release.yml
@@ -0,0 +1,79 @@
+name: Publish Cycamore Release
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '*'
+
+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: Installing Dependencies, Building Cycamore and running tests
+    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 Cycamore
+        uses: actions/checkout@v4
+
+      - name: Build and Test Cycamore
+        uses: docker/build-push-action@v5
+        with:
+          cache-from: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache
+          cache-to: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache,mode=max
+          file: docker/Dockerfile
+          build-args: |
+            pkg_mgr=${{ matrix.pkg_mgr }}
+            ubuntu_version=${{ matrix.ubuntu_versions }}
+            cyclus_tag=stable
+
+      - name: Push Cycamore
+        uses: docker/build-push-action@v5
+        with:
+          cache-from: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache
+          file: docker/Dockerfile
+          target: cycamore
+          push: true
+          tags: |
+            ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:${{ env.version_tag }}
+            ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:${{ env.stable_tag }}
+          build-args: |
+            pkg_mgr=${{ matrix.pkg_mgr }}
+            ubuntu_version=${{ matrix.ubuntu_versions }}
+            cyclus_tag=stable

From a6fbe92f865ce99f2cf1bbe1de342ee0d8404b78 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:39:45 -0600
Subject: [PATCH 09/28] edit commnet

---
 .github/workflows/build_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 691d4360a..4b8c030e5 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -97,7 +97,7 @@ jobs:
         with:
           comment_tag: ${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}_${{ matrix.cyclus_tag }}
           message: |
-            ## Downstream Build Statuses using Cycamore ${{ github.ref }} on cyclus_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}:${{ matrix.cyclus_tag }}
+            ## Build statuses using cyclus_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}:${{ matrix.cyclus_tag }}
             - Cycamore: ${{steps.build-cycamore.outcome == 'success' && '*Success* :white_check_mark:' || 
                 steps.build-cycamore.outcome == 'failure' && '**Failure** :x:' || 
                 '**Skipped due to upstream failure** :warning:'}}

From eac07da4bd28114381069ccca2bbbc97ac34c5fd Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:42:06 -0600
Subject: [PATCH 10/28] fix needs typo

---
 .github/workflows/build_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 4b8c030e5..93af4e49c 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -101,6 +101,6 @@ jobs:
             - Cycamore: ${{steps.build-cycamore.outcome == 'success' && '*Success* :white_check_mark:' || 
                 steps.build-cycamore.outcome == 'failure' && '**Failure** :x:' || 
                 '**Skipped due to upstream failure** :warning:'}}
-            - Cymetric: ${{needs.build-cymetric.outcome == 'success' && '*Success* :white_check_mark:' || 
+            - Cymetric: ${{steps.build-cymetric.outcome == 'success' && '*Success* :white_check_mark:' || 
                 steps.build-cymetric.outcome == 'failure' && '**Failure** :x:' || 
                 '**Skipped due to upstream failure** :warning:'}}

From 7fa7d27bd1da73eae3329af349217582213276f5 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 29 Jan 2024 11:02:53 -0600
Subject: [PATCH 11/28] add stable tag to matrix

---
 .github/workflows/build_test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 93af4e49c..0d1e0d50a 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -36,6 +36,7 @@ jobs:
         ]
         cyclus_tag: [
           latest,
+          stable,
         ]
 
     steps:

From 64ef87c64fcba87f1e0e16930afea332a9229bba Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 29 Jan 2024 11:05:43 -0600
Subject: [PATCH 12/28] update changelog

---
 CHANGELOG.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ad902a555..b991df2c6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,7 +5,8 @@ cycamore Change Log
 .. current developments
 **Added:**
 
-* GitHub workflows for building/testing on a PR and push to `main` (#549, #564)
+* GitHub workflow for publishing images on release (#573)
+* GitHub workflows for building/testing on a PR and push to `main` (#549, #564, #573)
 * Add functionality for random behavior on the size (#550) and frequency (#565) of a sink 
 * GitHub workflow to check that the CHANGELOG has been updated (#562) 
 * Added inventory policies to Storage through the material buy policy (#574)

From 0857eaa50f5b870f8b354ea325c41c7d76338534 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 29 Jan 2024 11:21:24 -0600
Subject: [PATCH 13/28] allow pr write permission

---
 .github/workflows/build_test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 0d1e0d50a..3cd842333 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -22,6 +22,7 @@ jobs:
     permissions:
       contents: read
       packages: write
+      pull-requests: write
 
     strategy:
       fail-fast: false

From 64fe3ca2476a8c0820feabadc3f2cabd962f30e9 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 29 Jan 2024 11:35:07 -0600
Subject: [PATCH 14/28] renamed workflows to be more transparent

---
 .../workflows/{build_test_publish.yml => publish_latest.yml}  | 4 ++--
 .github/workflows/publish_release.yml                         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename .github/workflows/{build_test_publish.yml => publish_latest.yml} (92%)

diff --git a/.github/workflows/build_test_publish.yml b/.github/workflows/publish_latest.yml
similarity index 92%
rename from .github/workflows/build_test_publish.yml
rename to .github/workflows/publish_latest.yml
index bdf1a0c8a..ebd81e864 100644
--- a/.github/workflows/build_test_publish.yml
+++ b/.github/workflows/publish_latest.yml
@@ -1,4 +1,4 @@
-name: Build and Publish Cycamore Images
+name: Publish Latest Cycamore
 
 on:
   # allows us to run workflows manually
@@ -32,7 +32,7 @@ jobs:
           latest,
         ]
 
-    name: Installing Dependencies, Building Cycamore and Running Tests
+    name: Building Cycamore and Running Tests
     steps:
       - name: Tag as ci-image-cache
         run: |
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
index 1253d3958..b29ed8bb1 100644
--- a/.github/workflows/publish_release.yml
+++ b/.github/workflows/publish_release.yml
@@ -1,4 +1,4 @@
-name: Publish Cycamore Release
+name: Publish Stable Cycamore
 
 on:
   push:
@@ -26,7 +26,7 @@ jobs:
           conda
         ]
 
-    name: Installing Dependencies, Building Cycamore and running tests
+    name: Building Cycamore and running tests
     steps:
       - name: Tag as ci-image-cache
         run: |

From be99cd221da5b48dc735160639c1ae8b57f38e4b Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 29 Jan 2024 11:40:14 -0600
Subject: [PATCH 15/28] rename job

---
 .github/workflows/publish_latest.yml  | 2 +-
 .github/workflows/publish_release.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish_latest.yml b/.github/workflows/publish_latest.yml
index ebd81e864..8e970faff 100644
--- a/.github/workflows/publish_latest.yml
+++ b/.github/workflows/publish_latest.yml
@@ -32,7 +32,7 @@ jobs:
           latest,
         ]
 
-    name: Building Cycamore and Running Tests
+    name: Build, Test, Publish
     steps:
       - name: Tag as ci-image-cache
         run: |
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
index b29ed8bb1..708843c80 100644
--- a/.github/workflows/publish_release.yml
+++ b/.github/workflows/publish_release.yml
@@ -26,7 +26,7 @@ jobs:
           conda
         ]
 
-    name: Building Cycamore and running tests
+    name: Build, Test, Publish
     steps:
       - name: Tag as ci-image-cache
         run: |

From d84c7a65d03fddb6b11f7894dc52bae859deeb91 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 29 Jan 2024 13:36:33 -0600
Subject: [PATCH 16/28] remove preliminary build step in publishing workflows

---
 .github/workflows/publish_latest.yml  | 16 +---------------
 .github/workflows/publish_release.yml | 13 +------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/publish_latest.yml b/.github/workflows/publish_latest.yml
index 8e970faff..97bfd2edf 100644
--- a/.github/workflows/publish_latest.yml
+++ b/.github/workflows/publish_latest.yml
@@ -28,9 +28,6 @@ jobs:
           apt,
           conda,
         ]
-        cyclus_tag : [
-          latest,
-        ]
 
     name: Build, Test, Publish
     steps:
@@ -62,20 +59,9 @@ jobs:
           cache-from: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache
           cache-to: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache,mode=max
           file: docker/Dockerfile
-          build-args: |
-            pkg_mgr=${{ matrix.pkg_mgr }}
-            ubuntu_version=${{ matrix.ubuntu_versions }}
-            cyclus_tag=${{ matrix.cyclus_tag }}
-
-      - name: Push Cycamore Image
-        uses: docker/build-push-action@v5
-        with:
-          cache-from: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache
-          file: docker/Dockerfile
-          target: cycamore
           push: true
           tags: ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:${{ env.tag }}
           build-args: |
             pkg_mgr=${{ matrix.pkg_mgr }}
             ubuntu_version=${{ matrix.ubuntu_versions }}
-            cyclus_tag=latest
\ No newline at end of file
+            cyclus_tag=latest
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
index 708843c80..b5bd7ba25 100644
--- a/.github/workflows/publish_release.yml
+++ b/.github/workflows/publish_release.yml
@@ -52,23 +52,12 @@ jobs:
       - name: Checkout Cycamore
         uses: actions/checkout@v4
 
-      - name: Build and Test Cycamore
+      - name: Build, Test, and Push Cycamore
         uses: docker/build-push-action@v5
         with:
           cache-from: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache
           cache-to: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache,mode=max
           file: docker/Dockerfile
-          build-args: |
-            pkg_mgr=${{ matrix.pkg_mgr }}
-            ubuntu_version=${{ matrix.ubuntu_versions }}
-            cyclus_tag=stable
-
-      - name: Push Cycamore
-        uses: docker/build-push-action@v5
-        with:
-          cache-from: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache
-          file: docker/Dockerfile
-          target: cycamore
           push: true
           tags: |
             ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:${{ env.version_tag }}

From 8017facbaabf4849f9cd8a76340156b16153b68b Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 5 Feb 2024 11:02:02 -0600
Subject: [PATCH 17/28] forgot to push image-cache for cycamore

---
 .github/workflows/build_test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 3cd842333..f6ed096d2 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -63,6 +63,8 @@ jobs:
           file: docker/Dockerfile
           cache-from: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache
           cache-to: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache,mode=max
+          tags: ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-image-cache
+          push: true
           build-args: |
             pkg_mgr=${{ matrix.pkg_mgr }}
             ubuntu_version=${{ matrix.ubuntu_versions }}

From c2d6652bd7d1aff61d25903223b3ee3ee6ed402a Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 5 Feb 2024 12:02:47 -0600
Subject: [PATCH 18/28] specify token since it is different repo

---
 .github/workflows/build_test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index f6ed096d2..29a1d113c 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -94,6 +94,7 @@ jobs:
             pkg_mgr=${{ matrix.pkg_mgr }}
             ubuntu_version=${{ matrix.ubuntu_versions }}
             cycamore_tag=ci-image-cache@${{ steps.build-cycamore.outputs.digest }}
+          secrets: ${{ secrets.GITHUB_TOKEN }}
 
       - name: PR Comment
         if: ${{ github.event_name == 'pull_request' }}

From 7668b2cbe9853800fe02983ecaac5ac535b4aa89 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 5 Feb 2024 12:05:24 -0600
Subject: [PATCH 19/28] forgot to specify key

---
 .github/workflows/build_test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 29a1d113c..1548ee8e5 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -94,7 +94,8 @@ jobs:
             pkg_mgr=${{ matrix.pkg_mgr }}
             ubuntu_version=${{ matrix.ubuntu_versions }}
             cycamore_tag=ci-image-cache@${{ steps.build-cycamore.outputs.digest }}
-          secrets: ${{ secrets.GITHUB_TOKEN }}
+          secrets: |
+            GIT_AUTH_TOKEN=${{ secrets.GITHUB_TOKEN }}
 
       - name: PR Comment
         if: ${{ github.event_name == 'pull_request' }}

From 4d9ac03caff211022d110387d1b627df1232d920 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 5 Feb 2024 13:34:55 -0600
Subject: [PATCH 20/28] reorder login step

---
 .github/workflows/build_test.yml     |  6 +++---
 .github/workflows/publish_latest.yml | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 1548ee8e5..878d3b1fe 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -42,6 +42,9 @@ jobs:
 
     steps:
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
@@ -49,9 +52,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Checkout Cycamore
         uses: actions/checkout@v4
 
diff --git a/.github/workflows/publish_latest.yml b/.github/workflows/publish_latest.yml
index 97bfd2edf..6a60911a8 100644
--- a/.github/workflows/publish_latest.yml
+++ b/.github/workflows/publish_latest.yml
@@ -40,6 +40,12 @@ jobs:
         run: |
           echo "tag=latest" >> "$GITHUB_ENV"
 
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
@@ -47,12 +53,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Build and Test Cycamore
         uses: docker/build-push-action@v5
         with:

From 9c040db3d00d2c03231ad51ffe8a94182013ab3d Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 5 Feb 2024 13:41:05 -0600
Subject: [PATCH 21/28] logout: false

---
 .github/workflows/build_test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 878d3b1fe..96220193d 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -51,6 +51,7 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
+          logout: false
 
       - name: Checkout Cycamore
         uses: actions/checkout@v4

From 4983b7339bc88993417f29b2cda21a648485a8cc Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Mon, 5 Feb 2024 14:08:16 -0600
Subject: [PATCH 22/28] remove bad attempts at permissioning

---
 .github/workflows/build_test.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 96220193d..44298bbf9 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -51,7 +51,6 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
-          logout: false
 
       - name: Checkout Cycamore
         uses: actions/checkout@v4
@@ -95,8 +94,6 @@ jobs:
             pkg_mgr=${{ matrix.pkg_mgr }}
             ubuntu_version=${{ matrix.ubuntu_versions }}
             cycamore_tag=ci-image-cache@${{ steps.build-cycamore.outputs.digest }}
-          secrets: |
-            GIT_AUTH_TOKEN=${{ secrets.GITHUB_TOKEN }}
 
       - name: PR Comment
         if: ${{ github.event_name == 'pull_request' }}

From 40a99da1a05eb7ea5856198863ed4d995ca6a1a5 Mon Sep 17 00:00:00 2001
From: Ben Nibbelink <bnibbs@vt.edu>
Date: Wed, 7 Feb 2024 17:44:51 -0600
Subject: [PATCH 23/28] update release name references

---
 .github/workflows/build_test.yml     | 6 ++++--
 .github/workflows/publish_latest.yml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 44298bbf9..85463ff28 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -5,13 +5,15 @@ on:
   workflow_dispatch:
   pull_request:
     paths-ignore:
-      - '.github/workflows/build_test_publish.yml'
+      - '.github/workflows/publish_latest.yml'
+      - '.github/workflows/publish_release.yml'
       - 'docker/**'
       - 'doc/**'
       - 'CHANGELOG.rst'
   push:
     paths-ignore:
-      - '.github/workflows/build_test_publish.yml'
+      - '.github/workflows/publish_latest.yml'
+      - '.github/workflows/publish_release.yml'
       - 'docker/**'
       - 'doc/**'
       - 'CHANGELOG.rst'
diff --git a/.github/workflows/publish_latest.yml b/.github/workflows/publish_latest.yml
index 6a60911a8..14bb95358 100644
--- a/.github/workflows/publish_latest.yml
+++ b/.github/workflows/publish_latest.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - '.github/workflows/build_test_publish.yml'
+      - '.github/workflows/publish_latest.yml'
       - 'docker/**'
   push:
     branches:

From 09435cd8fb523f973c89009b05177f9357143dd2 Mon Sep 17 00:00:00 2001
From: Ben Nibbelink <bnibbs@vt.edu>
Date: Wed, 7 Feb 2024 18:34:35 -0600
Subject: [PATCH 24/28] publish cymetric:latest on cycamore push to main

---
 .github/workflows/publish_latest.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/.github/workflows/publish_latest.yml b/.github/workflows/publish_latest.yml
index 14bb95358..b584e7d3b 100644
--- a/.github/workflows/publish_latest.yml
+++ b/.github/workflows/publish_latest.yml
@@ -54,6 +54,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and Test Cycamore
+        id: build-cycamore
         uses: docker/build-push-action@v5
         with:
           cache-from: type=registry,ref=ghcr.io/cyclus/cycamore_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cycamore:ci-layer-cache
@@ -65,3 +66,28 @@ jobs:
             pkg_mgr=${{ matrix.pkg_mgr }}
             ubuntu_version=${{ matrix.ubuntu_versions }}
             cyclus_tag=latest
+          
+      - name: Checkout Cymetric
+        if: ${{ steps.build-cycamore.outcome == 'success' }}
+        uses: actions/checkout@v4
+        with:
+          repository: cyclus/cymetric
+          ref: tag-build-arg
+          path: $HOME/cymetric
+
+      - name: Build and Test Cymetric
+        if: ${{ steps.build-cycamore.outcome == 'success' }}
+        continue-on-error: true
+        uses: docker/build-push-action@v5
+        with:
+          context: $HOME/cymetric
+          file: $HOME/cymetric/docker/Dockerfile
+          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
+          tags: ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:${{ env.tag }}
+          push: true
+          build-args: |
+            pkg_mgr=${{ matrix.pkg_mgr }}
+            ubuntu_version=${{ matrix.ubuntu_versions }}
+            cycamore_tag=${{ env.tag }}@${{ steps.build-cycamore.outputs.digest }}
+    
\ No newline at end of file

From 2808739597a2a60a083766d413279594309b2ec5 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Wed, 7 Feb 2024 20:44:41 -0600
Subject: [PATCH 25/28] change trigger ignores

---
 .github/workflows/build_test.yml     | 2 --
 .github/workflows/publish_latest.yml | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 85463ff28..22e169424 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -7,14 +7,12 @@ on:
     paths-ignore:
       - '.github/workflows/publish_latest.yml'
       - '.github/workflows/publish_release.yml'
-      - 'docker/**'
       - 'doc/**'
       - 'CHANGELOG.rst'
   push:
     paths-ignore:
       - '.github/workflows/publish_latest.yml'
       - '.github/workflows/publish_release.yml'
-      - 'docker/**'
       - 'doc/**'
       - 'CHANGELOG.rst'
 
diff --git a/.github/workflows/publish_latest.yml b/.github/workflows/publish_latest.yml
index b584e7d3b..f72dd8de0 100644
--- a/.github/workflows/publish_latest.yml
+++ b/.github/workflows/publish_latest.yml
@@ -6,7 +6,6 @@ on:
   pull_request:
     paths:
       - '.github/workflows/publish_latest.yml'
-      - 'docker/**'
   push:
     branches:
       - main
@@ -68,7 +67,6 @@ jobs:
             cyclus_tag=latest
           
       - name: Checkout Cymetric
-        if: ${{ steps.build-cycamore.outcome == 'success' }}
         uses: actions/checkout@v4
         with:
           repository: cyclus/cymetric
@@ -76,7 +74,6 @@ jobs:
           path: $HOME/cymetric
 
       - name: Build and Test Cymetric
-        if: ${{ steps.build-cycamore.outcome == 'success' }}
         continue-on-error: true
         uses: docker/build-push-action@v5
         with:

From 6060c0ee7d80b7f8aa6a2aca8e17b6c1cfcad338 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Fri, 9 Feb 2024 07:43:51 -0600
Subject: [PATCH 26/28] use well-defined directory to checkout cymetric

---
 .github/workflows/build_test.yml     | 6 +++---
 .github/workflows/publish_latest.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 22e169424..55da544a9 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -76,7 +76,7 @@ jobs:
         with:
           repository: cyclus/cymetric
           ref: tag-build-arg
-          path: $HOME/cymetric
+          path: ${{ github.workspace }}/cymetric
 
       - name: Build and Test Cymetric
         if: ${{ github.event_name == 'pull_request' && steps.build-cycamore.outcome == 'success' }}
@@ -84,8 +84,8 @@ jobs:
         continue-on-error: true
         uses: docker/build-push-action@v5
         with:
-          context: $HOME/cymetric
-          file: $HOME/cymetric/docker/Dockerfile
+          context: ${{ github.workspace }}/cymetric
+          file: ${{ github.workspace }}/cymetric/docker/Dockerfile
           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
           tags: ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:ci-image-cache
diff --git a/.github/workflows/publish_latest.yml b/.github/workflows/publish_latest.yml
index f72dd8de0..318f579f2 100644
--- a/.github/workflows/publish_latest.yml
+++ b/.github/workflows/publish_latest.yml
@@ -71,14 +71,14 @@ jobs:
         with:
           repository: cyclus/cymetric
           ref: tag-build-arg
-          path: $HOME/cymetric
+          path: ${{ github.workspace }}/cymetric
 
       - name: Build and Test Cymetric
         continue-on-error: true
         uses: docker/build-push-action@v5
         with:
-          context: $HOME/cymetric
-          file: $HOME/cymetric/docker/Dockerfile
+          context: ${{ github.workspace }}/cymetric
+          file: ${{ github.workspace }}/cymetric/docker/Dockerfile
           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
           tags: ghcr.io/cyclus/cymetric_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cymetric:${{ env.tag }}

From b709142ff006ef94ef949510104492558ba798d5 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Sat, 10 Feb 2024 17:40:09 -0600
Subject: [PATCH 27/28] change trigger for release

---
 .github/workflows/publish_release.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
index b5bd7ba25..e1ab28891 100644
--- a/.github/workflows/publish_release.yml
+++ b/.github/workflows/publish_release.yml
@@ -1,11 +1,8 @@
 name: Publish Stable Cycamore
 
 on:
-  push:
-    branches:
-      - main
-    tags:
-      - '*'
+  release:
+    types: [released]
 
 jobs:
   build-and-test-for-release:

From 293b758cd51eb575e91e5c59caa945f606cfca46 Mon Sep 17 00:00:00 2001
From: bennibbelink <79653949+bennibbelink@users.noreply.github.com>
Date: Sat, 10 Feb 2024 20:11:52 -0600
Subject: [PATCH 28/28] remove ref parameters from cymetric checkout

---
 .github/workflows/build_test.yml     | 1 -
 .github/workflows/publish_latest.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 55da544a9..ad5083f6f 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -75,7 +75,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: cyclus/cymetric
-          ref: tag-build-arg
           path: ${{ github.workspace }}/cymetric
 
       - name: Build and Test Cymetric
diff --git a/.github/workflows/publish_latest.yml b/.github/workflows/publish_latest.yml
index 318f579f2..44c3e6d67 100644
--- a/.github/workflows/publish_latest.yml
+++ b/.github/workflows/publish_latest.yml
@@ -70,7 +70,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: cyclus/cymetric
-          ref: tag-build-arg
           path: ${{ github.workspace }}/cymetric
 
       - name: Build and Test Cymetric