From 026977bf276e412897dd7e0236fdf721654aa535 Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Wed, 15 Jan 2025 15:52:08 -0500
Subject: [PATCH] Tweaks

---
 .gitea/workflows/build-release.yml | 30 +++++++++---------------------
 .gitea/workflows/build-test.yml    |  2 +-
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml
index 22b8a46..d5cd8d0 100644
--- a/.gitea/workflows/build-release.yml
+++ b/.gitea/workflows/build-release.yml
@@ -6,23 +6,11 @@ on:
       - release
 
 jobs:
-  Cleanup-Old-Artifacts:
-    runs-on: self-hosted
-    defaults:
-      run:
-        working-directory: /home/builds/src
-
-    steps:
-      - name: Cleanup old code
-        run: rm -rfv *
-
-
   Check-Environment:
     runs-on: self-hosted
-    needs: [Cleanup-Old-Artifacts]
     defaults:
       run:
-        working-directory: /home/builds/src
+        working-directory: /home/builds/src/ansible-dev
 
     steps:
       - name: Environment check
@@ -34,6 +22,11 @@ jobs:
           env && echo
           docker info && echo
 
+      - name: Verify current commit
+        run: |
+          git checkout ${{ env.GITHUB_REF_NAME }}
+          git log -1
+
 
   Build-Images:
     runs-on: self-hosted
@@ -43,17 +36,12 @@ jobs:
         working-directory: /home/builds/src/ansible-dev
 
     steps:
-      - name: Verify current commit
-        run: |
-          git checkout ${{ env.GITHUB_REF_NAME }}
-          git log -1
-
-      - name: Build Fedora Image
+      - name: Fedora
         run: |
           echo "docker build -f build/Containerfile.fedora -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} ."
           docker build -f build/Containerfile.fedora -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} .
 
-      - name: Build Debian Image
+      - name: Debian
         run: |
           echo "docker build -f build/Containerfile.debian -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} ."
           docker build -f build/Containerfile.debian -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} .
@@ -66,7 +54,7 @@ jobs:
       - name: Docker login
         run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }}
 
-      - name: Push Registry Images
+      - name: Push images to registry
         run: |
           pwd
           docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml
index 16f3e31..18f41b4 100644
--- a/.gitea/workflows/build-test.yml
+++ b/.gitea/workflows/build-test.yml
@@ -79,7 +79,7 @@ jobs:
       - name: Docker login
         run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }}
 
-      - name: Push Registry Images
+      - name: Push images to registry
         run: |
           pwd
           docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}