From 3b72402f6d09bfb328af101f1761559055c46dfb Mon Sep 17 00:00:00 2001
From: Aetherinox <aetherinox@proton.me>
Date: Sun, 23 Feb 2025 20:11:01 -0700
Subject: [PATCH] ci: re-organize env variable order

---
 .github/workflows/deploy-docker-all.yml       | 166 +++++++++---------
 .github/workflows/deploy-docker-dockerhub.yml |  42 ++---
 .github/workflows/deploy-docker-gitea.yml     |  42 ++---
 .github/workflows/deploy-docker-github.yml    |  42 ++---
 4 files changed, 151 insertions(+), 141 deletions(-)

diff --git a/.github/workflows/deploy-docker-all.yml b/.github/workflows/deploy-docker-all.yml
index b9c6d6ec..61dc0e1e 100755
--- a/.github/workflows/deploy-docker-all.yml
+++ b/.github/workflows/deploy-docker-all.yml
@@ -284,20 +284,7 @@ jobs:
                   echo "Starting Github Docker arm64"
 
             # #
-            #   Release › Github › Get Timestamp
-            # #
-
-            - name: '🕛 Get Timestamp'
-              id: task_release_set_timestamp
-              run: |
-                  echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
-                  echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
-                  echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
-                  echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
-                  echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
-
-            # #
-            #   Release › Github › Checkout › Arm64
+            #   Release › Github › Checkout
             # #
 
             - name: '✅ Checkout'
@@ -306,6 +293,20 @@ jobs:
               with:
                   fetch-depth: 0
 
+            # #
+            #   Release › Github › Get Timestamp
+            # #
+
+            - name: '🕛 Get Timestamp'
+              id: task_release_set_timestamp
+              run: |
+                  echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
+                  echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
+                  echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
+                  echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
+                  echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
+                  echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
+
             # #
             #   Release › Github › Install Dependencies
             # #
@@ -537,20 +538,7 @@ jobs:
                   echo "Starting Github docker release"
 
             # #
-            #   Release › Github › Get Timestamp
-            # #
-
-            - name: '🕛 Get Timestamp'
-              id: task_release_set_timestamp
-              run: |
-                  echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
-                  echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
-                  echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
-                  echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
-                  echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
-
-            # #
-            #   Release › Github › Checkout › Amd64
+            #   Release › Github › Checkout
             # #
 
             - name: '✅ Checkout'
@@ -559,6 +547,20 @@ jobs:
               with:
                   fetch-depth: 0
 
+            # #
+            #   Release › Github › Get Timestamp
+            # #
+
+            - name: '🕛 Get Timestamp'
+              id: task_release_set_timestamp
+              run: |
+                  echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
+                  echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
+                  echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
+                  echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
+                  echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
+                  echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
+
             # #
             #   Release › Github › Install Dependencies
             # #
@@ -789,19 +791,6 @@ jobs:
               run: |
                   echo "Starting Dockerhub arm64"
 
-            # #
-            #   Release › Dockerhub › Get Timestamp
-            # #
-
-            - name: '🕛 Get Timestamp'
-              id: task_release_set_timestamp
-              run: |
-                  echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
-                  echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
-                  echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
-                  echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
-                  echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
-
             # #
             #   Release › Dockerhub › Checkout › Arm64
             # #
@@ -812,6 +801,20 @@ jobs:
               with:
                   fetch-depth: 0
 
+            # #
+            #   Release › Dockerhub › Get Timestamp
+            # #
+
+            - name: '🕛 Get Timestamp'
+              id: task_release_set_timestamp
+              run: |
+                  echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
+                  echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
+                  echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
+                  echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
+                  echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
+                  echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
+
             # #
             #   Release › Dockerhub › Install Dependencies
             # #
@@ -1041,19 +1044,6 @@ jobs:
               run: |
                   echo "Starting Dockerhub docker release"
 
-            # #
-            #   Release › Dockerhub › Get Timestamp
-            # #
-
-            - name: '🕛 Get Timestamp'
-              id: task_release_set_timestamp
-              run: |
-                  echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
-                  echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
-                  echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
-                  echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
-                  echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
-
             # #
             #   Release › Dockerhub › Checkout › Amd64
             # #
@@ -1064,6 +1054,20 @@ jobs:
               with:
                   fetch-depth: 0
 
+            # #
+            #   Release › Dockerhub › Get Timestamp
+            # #
+
+            - name: '🕛 Get Timestamp'
+              id: task_release_set_timestamp
+              run: |
+                  echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
+                  echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
+                  echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
+                  echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
+                  echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
+                  echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
+
             # #
             #   Release › Dockerhub › Install Dependencies
             # #
@@ -1294,19 +1298,6 @@ jobs:
               run: |
                   echo "Starting Gitea Docker arm64"
 
-            # #
-            #   Release › Gitea › Get Timestamp
-            # #
-
-            - name: '🕛 Get Timestamp'
-              id: task_release_set_timestamp
-              run: |
-                  echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
-                  echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
-                  echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
-                  echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
-                  echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
-
             # #
             #   Release › Gitea › Checkout › Arm64
             # #
@@ -1317,6 +1308,20 @@ jobs:
               with:
                   fetch-depth: 0
 
+            # #
+            #   Release › Gitea › Get Timestamp
+            # #
+
+            - name: '🕛 Get Timestamp'
+              id: task_release_set_timestamp
+              run: |
+                  echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
+                  echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
+                  echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
+                  echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
+                  echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
+                  echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
+
             # #
             #   Release › Gitea › Install Dependencies
             # #
@@ -1547,19 +1552,6 @@ jobs:
               run: |
                   echo "Starting Gitea docker release"
 
-            # #
-            #   Release › Gitea › Get Timestamp
-            # #
-
-            - name: '🕛 Get Timestamp'
-              id: task_release_set_timestamp
-              run: |
-                  echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
-                  echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
-                  echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
-                  echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
-                  echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
-
             # #
             #   Release › Gitea › Checkout › Amd64
             # #
@@ -1570,6 +1562,20 @@ jobs:
               with:
                   fetch-depth: 0
 
+            # #
+            #   Release › Gitea › Get Timestamp
+            # #
+
+            - name: '🕛 Get Timestamp'
+              id: task_release_set_timestamp
+              run: |
+                  echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
+                  echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
+                  echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
+                  echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
+                  echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
+                  echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
+
             # #
             #   Release › Gitea › Install Dependencies
             # #
diff --git a/.github/workflows/deploy-docker-dockerhub.yml b/.github/workflows/deploy-docker-dockerhub.yml
index 2c6bbece..0442862b 100755
--- a/.github/workflows/deploy-docker-dockerhub.yml
+++ b/.github/workflows/deploy-docker-dockerhub.yml
@@ -229,6 +229,16 @@ jobs:
               run: |
                   echo "Starting Dockerhub arm64"
 
+            # #
+            #   Release › Dockerhub › Checkout › Amd64
+            # #
+
+            - name: '✅ Checkout'
+              id: task_release_gh_checkout
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
             # #
             #   Release › Dockerhub › Get Timestamp
             # #
@@ -237,21 +247,12 @@ jobs:
               id: task_release_set_timestamp
               run: |
                   echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
+                  echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
                   echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
                   echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
                   echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
                   echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
 
-            # #
-            #   Release › Dockerhub › Checkout › Arm64
-            # #
-
-            - name: '✅ Checkout'
-              id: task_release_dh_checkout
-              uses: actions/checkout@v4
-              with:
-                  fetch-depth: 0
-
             # #
             #   Release › Dockerhub › Install Dependencies
             # #
@@ -481,6 +482,16 @@ jobs:
               run: |
                   echo "Starting Dockerhub docker release"
 
+            # #
+            #   Release › Dockerhub › Checkout › Amd64
+            # #
+
+            - name: '✅ Checkout'
+              id: task_release_gh_checkout
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
             # #
             #   Release › Dockerhub › Get Timestamp
             # #
@@ -489,21 +500,12 @@ jobs:
               id: task_release_set_timestamp
               run: |
                   echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
+                  echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
                   echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
                   echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
                   echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
                   echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
 
-            # #
-            #   Release › Dockerhub › Checkout › Amd64
-            # #
-
-            - name: '✅ Checkout'
-              id: task_release_dh_checkout
-              uses: actions/checkout@v4
-              with:
-                  fetch-depth: 0
-
             # #
             #   Release › Dockerhub › Install Dependencies
             # #
diff --git a/.github/workflows/deploy-docker-gitea.yml b/.github/workflows/deploy-docker-gitea.yml
index db03ec31..2c431268 100755
--- a/.github/workflows/deploy-docker-gitea.yml
+++ b/.github/workflows/deploy-docker-gitea.yml
@@ -228,6 +228,16 @@ jobs:
               run: |
                   echo "Starting Gitea Docker arm64"
 
+            # #
+            #   Release › Gitea › Checkout › Arm64
+            # #
+
+            - name: '✅ Checkout'
+              id: task_release_gh_checkout
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
             # #
             #   Release › Gitea › Get Timestamp
             # #
@@ -236,21 +246,12 @@ jobs:
               id: task_release_set_timestamp
               run: |
                   echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
+                  echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
                   echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
                   echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
                   echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
                   echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
 
-            # #
-            #   Release › Gitea › Checkout › Arm64
-            # #
-
-            - name: '✅ Checkout'
-              id: task_release_gi_checkout
-              uses: actions/checkout@v4
-              with:
-                  fetch-depth: 0
-
             # #
             #   Release › Gitea › Install Dependencies
             # #
@@ -481,6 +482,16 @@ jobs:
               run: |
                   echo "Starting Gitea docker release"
 
+            # #
+            #   Release › Gitea › Checkout
+            # #
+
+            - name: '✅ Checkout'
+              id: task_release_gh_checkout
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
             # #
             #   Release › Gitea › Get Timestamp
             # #
@@ -489,21 +500,12 @@ jobs:
               id: task_release_set_timestamp
               run: |
                   echo "DOCKER_IMAGE=`echo ${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
+                  echo "DOCKER_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
                   echo "NOW=$(date +'%m-%d-%Y %H:%M:%S')" >> $GITHUB_ENV
                   echo "NOW_SHORT=$(date +'%m-%d-%Y')" >> $GITHUB_ENV
                   echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
                   echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
 
-            # #
-            #   Release › Gitea › Checkout › Amd64
-            # #
-
-            - name: '✅ Checkout'
-              id: task_release_gi_checkout
-              uses: actions/checkout@v4
-              with:
-                  fetch-depth: 0
-
             # #
             #   Release › Gitea › Install Dependencies
             # #
diff --git a/.github/workflows/deploy-docker-github.yml b/.github/workflows/deploy-docker-github.yml
index df1eed36..b6d4dffa 100755
--- a/.github/workflows/deploy-docker-github.yml
+++ b/.github/workflows/deploy-docker-github.yml
@@ -228,6 +228,16 @@ jobs:
               run: |
                   echo "Starting Github Docker arm64"
 
+            # #
+            #   Release › Github › Checkout › Arm64
+            # #
+
+            - name: '✅ Checkout'
+              id: task_release_gh_checkout
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
             # #
             #   Release › Github › Get Timestamp
             # #
@@ -242,16 +252,6 @@ jobs:
                   echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
                   echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
 
-            # #
-            #   Release › Github › Checkout › Arm64
-            # #
-
-            - name: '✅ Checkout'
-              id: task_release_gh_checkout
-              uses: actions/checkout@v4
-              with:
-                  fetch-depth: 0
-
             # #
             #   Release › Github › Install Dependencies
             # #
@@ -484,7 +484,17 @@ jobs:
                   echo "Starting Github docker release"
 
             # #
-            #   Release › Get Timestamp
+            #   Release › Github › Checkout › Amd64
+            # #
+
+            - name: '✅ Checkout'
+              id: task_release_gh_checkout
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
+            # #
+            #   Release › Github › Get Timestamp
             # #
 
             - name: '🕛 Get Timestamp'
@@ -497,16 +507,6 @@ jobs:
                   echo "NOW_LONG=$(date +'%m-%d-%Y %H:%M')" >> $GITHUB_ENV
                   echo "NOW_DOCKER_LABEL=$(date +'%Y%m%d')" >> $GITHUB_ENV
 
-            # #
-            #   Release › Github › Checkout › Amd64
-            # #
-
-            - name: '✅ Checkout'
-              id: task_release_gh_checkout
-              uses: actions/checkout@v4
-              with:
-                  fetch-depth: 0
-
             # #
             #   Release › Github › Install Dependencies
             # #