Update build-base-image.yml

open-space-collective · Jan 8, 2025 · 29b3d1b · 29b3d1b
1 parent 46395a3
commit 29b3d1b
Showing 1 changed file with 5 additions and 18 deletions.
diff --git a/.github/workflows/build-base-image.yml b/.github/workflows/build-base-image.yml
@@ -43,41 +43,28 @@ jobs:
           echo "Project version: ${project_version}"
           echo "value=${project_version}" >> $GITHUB_OUTPUT
 
-  build-part1-of-base-image:
-    name: Build Part 1 of Base Image
+  build-and-push-and-tag-base-image:
+    name: Build and Push and Tag Base Image with Version
     needs:
       - prepare-environment
     uses: ./.github/workflows/build-image.yml
-    with:
-      project_name: ${{ needs.prepare-environment.outputs.project_name }}
-      project_version: ${{ needs.prepare-environment.outputs.project_version }}
-      push: false
-      target: base1
-    secrets: inherit
-
-  build-part2-and-push-and-tag-base-image:
-    name: Build Part 2 and Push and Tag Base Image with Version
-    needs:
-      - prepare-environment
-      - build-part1-of-base-image
-    uses: ./.github/workflows/build-image.yml
     with:
       project_name: ${{ needs.prepare-environment.outputs.project_name }}
       project_version: ${{ needs.prepare-environment.outputs.project_version }}
       push: true
-      target: base2
+      target: base
     secrets: inherit
 
   push-and-tag-base-image-as-latest:
     if: github.event_name == 'release' && github.event.action == 'published'
     name: Push and Tag Base Image as Latest
     needs:
       - prepare-environment
-      - build-part2-and-push-and-tag-base-image
+      - build-and-push-and-tag-base-image
     uses: ./.github/workflows/build-image.yml
     with:
       project_name: ${{ needs.prepare-environment.outputs.project_name }}
       project_version: latest
       push: true
-      target: base2
+      target: base
     secrets: inherit