From b1b1de6cde1f9bb671c27ded0131c3eebf7e9daa Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Wed, 15 Jan 2025 17:59:34 -0500
Subject: [PATCH] Push to release (#29)

Reviewed-on: https://gitea.thezengarden.net/podman/ansible-dev/pulls/29
Co-authored-by: Chris Hammer <chris@thezengarden.net>
Co-committed-by: Chris Hammer <chris@thezengarden.net>
---
 .gitea/workflows/build-release.yml | 48 +++++++-----------------------
 .gitea/workflows/build-test.yml    |  3 ++
 2 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml
index 5ecc2b3..e120d18 100644
--- a/.gitea/workflows/build-release.yml
+++ b/.gitea/workflows/build-release.yml
@@ -6,56 +6,25 @@ on:
       - release
 
 jobs:
-  Cleanup-Old-Artifacts:
+  Checkout-Branch:
     runs-on: self-hosted
     defaults:
       run:
-        working-directory: /home/builds/src
+        working-directory: /home/builds/src/ansible-dev
 
     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
-
-    steps:
-      - name: Environment check
+      - name: "Checkout branch: ${{ env.GITHUB_REF_NAME }}"
         run: |
-          echo "BUILD_USER: $(whoami)" && echo
-          echo "PWD: $(pwd)" && echo
-          hostnamectl && echo
-          lscpu && echo
-          env && echo
-          docker info && echo
-
-
-  Clone-Repo:
-    runs-on: self-hosted
-    needs: [Check-Environment]
-    defaults:
-      run:
-        working-directory: /home/builds/src
-
-    steps:
-      - name: Clone repository
-        run: |
-          git clone https://gitea.thezengarden.net/podman/ansible-dev.git
-          cd ansible-dev
+          git fetch origin ${{ env.GITHUB_REF_NAME }}:${{ env.GITHUB_REF_NAME }}
           git checkout ${{ env.GITHUB_REF_NAME }}
 
       - name: Verify current commit
-        run: cd ansible-dev && git log -1
+        run: git log -1
 
 
   Build-Images:
     runs-on: self-hosted
-    needs: [Check-Environment]
+    needs: [Checkout-Branch]
     defaults:
       run:
         working-directory: /home/builds/src/ansible-dev
@@ -91,7 +60,10 @@ jobs:
     needs: [Build-Images, Push-Images]
     steps:
       - name: Cleanup build images
-        run: docker system prune -af
+        run: |
+          pwd
+          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
+          docker rmi ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}
 
 
   Cleanup-Docker-Login:
diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml
index 18f41b4..2bbb6b4 100644
--- a/.gitea/workflows/build-test.yml
+++ b/.gitea/workflows/build-test.yml
@@ -16,6 +16,9 @@ jobs:
       - name: Cleanup old code
         run: rm -rfv *
 
+      - name: Cleanup old build cache
+        run: docker system prune -af
+
 
   Check-Environment:
     runs-on: self-hosted