Consistency in job steps

gbraad-dotfiles · Mar 9, 2025 · 89db3bf · 89db3bf
1 parent 6ba297d
commit 89db3bf
Show file tree

Hide file tree

Showing 9 changed files with 135 additions and 51 deletions.
diff --git a/.github/workflows/build-container-almalinux-bootc.yml b/.github/workflows/build-container-almalinux-bootc.yml
@@ -28,15 +28,25 @@ jobs:
             --build-arg=ROOTHOME="/var/roothome" \
             -f .devcontainer/almalinux/Containerfile .
 
-      - name: Tag and push image to ghcr.io - almalinux-bootc
+      - name: Set release tag
+        id: get-tag
+        run: |
+          echo "TAG=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+
+      - name: Tag container
         run: |
-          DATE=$(date +"%y%m%d")
           podman tag ghcr.io/gbraad-dotfiles/almalinux-bootc:latest \
             ghcr.io/gbraad-dotfiles/almalinux-bootc:9
           podman tag ghcr.io/gbraad-dotfiles/almalinux-bootc:latest \
-            ghcr.io/gbraad-dotfiles/almalinux-bootc:${DATE}
+            ghcr.io/gbraad-dotfiles/almalinux-bootc:${{steps.get-tag.outputs.TAG}}
+
+      - name: Login to registry
+        run: |
           podman login ghcr.io -u ${{ github.actor }} \
             -p ${{ secrets.GITHUB_TOKEN }}
-          podman push ghcr.io/gbraad-dotfiles/almalinux-bootc:${DATE}
-          podman push ghcr.io/gbraad-dotfiles/almalinux-bootc:9
+
+      - name: Push container to registry
+        run: |
           podman push ghcr.io/gbraad-dotfiles/almalinux-bootc:latest
+          podman push ghcr.io/gbraad-dotfiles/almalinux-bootc:9
+          podman push ghcr.io/gbraad-dotfiles/almalinux-bootc:${{steps.get-tag.outputs.TAG}}
diff --git a/.github/workflows/build-container-almalinux.yml b/.github/workflows/build-container-almalinux.yml
@@ -25,16 +25,25 @@ jobs:
             --build-arg=BASE_VERSION="9" \
             -f .devcontainer/almalinux/Containerfile .
 
-      - name: Tag and push image to ghcr.io - almalinux
+      - name: Set release tag
+        id: get-tag
+        run: |
+          echo "TAG=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+
+      - name: Tag container
         run: |
-          DATE=$(date +"%y%m%d")
           podman tag ghcr.io/gbraad-dotfiles/almalinux:latest \
             ghcr.io/gbraad-dotfiles/almalinux:9
           podman tag ghcr.io/gbraad-dotfiles/almalinux:latest \
-            ghcr.io/gbraad-dotfiles/almalinux:${DATE}
+            ghcr.io/gbraad-dotfiles/almalinux:${{steps.get-tag.outputs.TAG}}
+
+      - name: Login to registry
+        run: |
           podman login ghcr.io -u ${{ github.actor }} \
             -p ${{ secrets.GITHUB_TOKEN }}
-          podman push ghcr.io/gbraad-dotfiles/almalinux:${DATE}
-          podman push ghcr.io/gbraad-dotfiles/almalinux:9
-          podman push ghcr.io/gbraad-dotfiles/almalinux:latest
 
+      - name: Push container to registry
+        run: |
+          podman push ghcr.io/gbraad-dotfiles/almalinux:latest
+          podman push ghcr.io/gbraad-dotfiles/almalinux:9
+          podman push ghcr.io/gbraad-dotfiles/almalinux:${{steps.get-tag.outputs.TAG}}
diff --git a/.github/workflows/build-container-centos-bootc.yml b/.github/workflows/build-container-centos-bootc.yml
@@ -28,15 +28,25 @@ jobs:
             --build-arg=ROOTHOME="/var/roothome" \
             -f .devcontainer/centos/Containerfile .
 
-      - name: Tag and push image to ghcr.io - centos-bootc
+      - name: Set release tag
+        id: get-tag
+        run: |
+          echo "TAG=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+
+      - name: Tag container
         run: |
-          DATE=$(date +"%y%m%d")
           podman tag ghcr.io/gbraad-dotfiles/centos-bootc:latest \
             ghcr.io/gbraad-dotfiles/centos-bootc:stream9
           podman tag ghcr.io/gbraad-dotfiles/centos-bootc:latest \
-            ghcr.io/gbraad-dotfiles/centos-bootc:${DATE}
+            ghcr.io/gbraad-dotfiles/centos-bootc:${{steps.get-tag.outputs.TAG}}
+
+      - name: Login to registry
+        run: |
           podman login ghcr.io -u ${{ github.actor }} \
             -p ${{ secrets.GITHUB_TOKEN }}
-          podman push ghcr.io/gbraad-dotfiles/centos-bootc:${DATE}
-          podman push ghcr.io/gbraad-dotfiles/centos-bootc:stream9
+
+      - name: Push container to registry
+        run: |
           podman push ghcr.io/gbraad-dotfiles/centos-bootc:latest
+          podman push ghcr.io/gbraad-dotfiles/centos-bootc:stream9
+          podman push ghcr.io/gbraad-dotfiles/centos-bootc:${{steps.get-tag.outputs.TAG}}
diff --git a/.github/workflows/build-container-centos.yml b/.github/workflows/build-container-centos.yml
@@ -25,16 +25,25 @@ jobs:
             --build-arg=BASE_VERSION="stream9" \
             -f .devcontainer/centos/Containerfile .
 
-      - name: Tag and push image to ghcr.io - centos
+      - name: Set release tag
+        id: get-tag
+        run: |
+          echo "TAG=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+
+      - name: Tag container
         run: |
-          DATE=$(date +"%y%m%d")
           podman tag ghcr.io/gbraad-dotfiles/centos:latest \
             ghcr.io/gbraad-dotfiles/centos:stream9
           podman tag ghcr.io/gbraad-dotfiles/centos:latest \
-            ghcr.io/gbraad-dotfiles/centos:${DATE}
+            ghcr.io/gbraad-dotfiles/centos:${{steps.get-tag.outputs.TAG}}
+
+      - name: Login to registry
+        run: |
           podman login ghcr.io -u ${{ github.actor }} \
             -p ${{ secrets.GITHUB_TOKEN }}
-          podman push ghcr.io/gbraad-dotfiles/centos:${DATE}
-          podman push ghcr.io/gbraad-dotfiles/centos:stream9
-          podman push ghcr.io/gbraad-dotfiles/centos:latest
 
+      - name: Push container to registry
+        run: |
+          podman push ghcr.io/gbraad-dotfiles/centos:latest
+          podman push ghcr.io/gbraad-dotfiles/centos:stream9
+          podman push ghcr.io/gbraad-dotfiles/centos:${{steps.get-tag.outputs.TAG}}
diff --git a/.github/workflows/build-container-debian.yml b/.github/workflows/build-container-debian.yml
@@ -23,16 +23,25 @@ jobs:
           podman build -t ghcr.io/gbraad-dotfiles/debian:latest \
             -f .devcontainer/debian/Containerfile .
 
-      - name: Tag and push image to ghcr.io - debian
+      - name: Set release tag
+        id: get-tag
+        run: |
+          echo "TAG=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+
+      - name: Tag container
         run: |
-          DATE=$(date +"%y%m%d")
           podman tag ghcr.io/gbraad-dotfiles/debian:latest \
             ghcr.io/gbraad-dotfiles/debian:bookworm
           podman tag ghcr.io/gbraad-dotfiles/debian:latest \
-            ghcr.io/gbraad-dotfiles/debian:${DATE}
+            ghcr.io/gbraad-dotfiles/debian:${{steps.get-tag.outputs.TAG}}
+
+      - name: Login to registry
+        run: |
           podman login ghcr.io -u ${{ github.actor }} \
             -p ${{ secrets.GITHUB_TOKEN }}
-          podman push ghcr.io/gbraad-dotfiles/debian:${DATE}
-          podman push ghcr.io/gbraad-dotfiles/debian:bookworm
-          podman push ghcr.io/gbraad-dotfiles/debian:latest
 
+      - name: Push container to registry
+        run: |
+          podman push ghcr.io/gbraad-dotfiles/debian:latest
+          podman push ghcr.io/gbraad-dotfiles/debian:bookworm
+          podman push ghcr.io/gbraad-dotfiles/debian:${{steps.get-tag.outputs.TAG}}
diff --git a/.github/workflows/build-container-fedora-bootc.yml b/.github/workflows/build-container-fedora-bootc.yml
@@ -28,15 +28,25 @@ jobs:
             --build-arg=ROOTHOME="/var/roothome" \
             -f .devcontainer/fedora/Containerfile .
 
-      - name: Tag and push image to ghcr.io - fedora-bootc
+      - name: Set release tag
+        id: get-tag
+        run: |
+          echo "TAG=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+
+      - name: Tag container
         run: |
-          DATE=$(date +"%y%m%d")
           podman tag ghcr.io/gbraad-dotfiles/fedora-bootc:latest \
             ghcr.io/gbraad-dotfiles/fedora-bootc:41
           podman tag ghcr.io/gbraad-dotfiles/fedora-bootc:latest \
-            ghcr.io/gbraad-dotfiles/fedora-bootc:${DATE}
+            ghcr.io/gbraad-dotfiles/fedora-bootc:${{steps.get-tag.outputs.TAG}}
+
+      - name: Login to registry
+        run: |
           podman login ghcr.io -u ${{ github.actor }} \
             -p ${{ secrets.GITHUB_TOKEN }}
-          podman push ghcr.io/gbraad-dotfiles/fedora-bootc:${DATE}
-          podman push ghcr.io/gbraad-dotfiles/fedora-bootc:41
+
+      - name: Push container to registry
+        run: |
           podman push ghcr.io/gbraad-dotfiles/fedora-bootc:latest
+          podman push ghcr.io/gbraad-dotfiles/fedora-bootc:41
+          podman push ghcr.io/gbraad-dotfiles/fedora-bootc:${{steps.get-tag.outputs.TAG}}
diff --git a/.github/workflows/build-container-fedora.yml b/.github/workflows/build-container-fedora.yml
@@ -25,16 +25,25 @@ jobs:
             --build-arg=BASE_VERSION=41 \
             -f .devcontainer/fedora/Containerfile .
 
-      - name: Tag and push image to ghcr.io - fedora
+      - name: Set release tag
+        id: get-tag
+        run: |
+          echo "TAG=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+
+      - name: Tag container
         run: |
-          DATE=$(date +"%y%m%d")
           podman tag ghcr.io/gbraad-dotfiles/fedora:latest \
             ghcr.io/gbraad-dotfiles/fedora:41
           podman tag ghcr.io/gbraad-dotfiles/fedora:latest \
-            ghcr.io/gbraad-dotfiles/fedora:${DATE}
+            ghcr.io/gbraad-dotfiles/fedora:${{steps.get-tag.outputs.TAG}}
+
+      - name: Login to registry
+        run: |
           podman login ghcr.io -u ${{ github.actor }} \
             -p ${{ secrets.GITHUB_TOKEN }}
-          podman push ghcr.io/gbraad-dotfiles/fedora:${DATE}
-          podman push ghcr.io/gbraad-dotfiles/fedora:41
-          podman push ghcr.io/gbraad-dotfiles/fedora:latest
 
+      - name: Push container to registry
+        run: |
+          podman push ghcr.io/gbraad-dotfiles/fedora:latest
+          podman push ghcr.io/gbraad-dotfiles/fedora:41
+          podman push ghcr.io/gbraad-dotfiles/fedora:${{steps.get-tag.outputs.TAG}}
diff --git a/.github/workflows/build-container-ubi9.yml b/.github/workflows/build-container-ubi9.yml
@@ -25,16 +25,25 @@ jobs:
             --build-arg=BASE_VERSION="9.5" \
             -f .devcontainer/ubi9/Containerfile .
 
-      - name: Tag and push image to ghcr.io - ubi9
+      - name: Set release tag
+        id: get-tag
+        run: |
+          echo "TAG=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+
+      - name: Tag container
         run: |
-          DATE=$(date +"%y%m%d")
           podman tag ghcr.io/gbraad-dotfiles/ubi9:latest \
             ghcr.io/gbraad-dotfiles/ubi9:9.5
           podman tag ghcr.io/gbraad-dotfiles/ubi9:latest \
-            ghcr.io/gbraad-dotfiles/ubi9:${DATE}
+            ghcr.io/gbraad-dotfiles/ubi9:${{steps.get-tag.outputs.TAG}}
+
+      - name: Login to registry
+        run: |
           podman login ghcr.io -u ${{ github.actor }} \
             -p ${{ secrets.GITHUB_TOKEN }}
-          podman push ghcr.io/gbraad-dotfiles/ubi9:${DATE}
-          podman push ghcr.io/gbraad-dotfiles/ubi9:9.5
-          podman push ghcr.io/gbraad-dotfiles/ubi9:latest
 
+      - name: Push container to registry
+        run: |
+          podman push ghcr.io/gbraad-dotfiles/ubi9:latest
+          podman push ghcr.io/gbraad-dotfiles/ubi9:9.5
+          podman push ghcr.io/gbraad-dotfiles/ubi9:${{steps.get-tag.outputs.TAG}}
diff --git a/.github/workflows/build-container-ubuntu.yml b/.github/workflows/build-container-ubuntu.yml
@@ -23,16 +23,25 @@ jobs:
           podman build -t ghcr.io/gbraad-dotfiles/ubuntu:latest \
             -f .devcontainer/ubuntu/Containerfile .
 
-      - name: Tag and push image to ghcr.io - ubuntu
+      - name: Set release tag
+        id: get-tag
+        run: |
+          echo "TAG=$(date +'%y%m%d')" >> $GITHUB_OUTPUT
+
+      - name: Tag container
         run: |
-          DATE=$(date +"%y%m%d")
           podman tag ghcr.io/gbraad-dotfiles/ubuntu:latest \
             ghcr.io/gbraad-dotfiles/ubuntu:noble
           podman tag ghcr.io/gbraad-dotfiles/ubuntu:latest \
-            ghcr.io/gbraad-dotfiles/ubuntu:${DATE}
+            ghcr.io/gbraad-dotfiles/ubuntu:${{steps.get-tag.outputs.TAG}}
+
+      - name: Login to registry
+        run: |
           podman login ghcr.io -u ${{ github.actor }} \
             -p ${{ secrets.GITHUB_TOKEN }}
-          podman push ghcr.io/gbraad-dotfiles/ubuntu:${DATE}
-          podman push ghcr.io/gbraad-dotfiles/ubuntu:noble
-          podman push ghcr.io/gbraad-dotfiles/ubuntu:latest
 
+      - name: Push container to registry
+        run: |
+          podman push ghcr.io/gbraad-dotfiles/ubuntu:latest
+          podman push ghcr.io/gbraad-dotfiles/ubuntu:noble
+          podman push ghcr.io/gbraad-dotfiles/ubuntu:${{steps.get-tag.outputs.TAG}}