remove preliminary build step in publishing workflows

cyclus · Feb 5, 2024 · 42fe83a · 42fe83a
1 parent ba66aa0
commit 42fe83a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 27 deletions.
diff --git 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
+            cyclus_tag=latest
diff --git 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 }}