From c6b72159bae31cb9e40662a91503fae33476fa49 Mon Sep 17 00:00:00 2001
From: Annika Merris <me@annikamerris.com>
Date: Sun, 4 Feb 2024 11:12:43 -0500
Subject: [PATCH] More Tweaks To Actions

---
 .forgejo/{workflows => }/debugging.yml |  9 +++++++++
 .forgejo/{ => workflows}/release.yml   | 15 ++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 rename .forgejo/{workflows => }/debugging.yml (85%)
 rename .forgejo/{ => workflows}/release.yml (78%)

diff --git a/.forgejo/workflows/debugging.yml b/.forgejo/debugging.yml
similarity index 85%
rename from .forgejo/workflows/debugging.yml
rename to .forgejo/debugging.yml
index 80f24a8..b30de99 100644
--- a/.forgejo/workflows/debugging.yml
+++ b/.forgejo/debugging.yml
@@ -2,6 +2,13 @@
 name: release
 on:
   push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - 'main'
 
 env:
   DOCKER_HOST: tcp://docker-in-docker:2375
@@ -28,6 +35,8 @@ jobs:
             type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
+          labels: |
+            org.opencontainers.image.licenses=MIT
       - name: Debugging steps.meta.outputs.tags
         shell: /bin/ash -e {0}
         run: echo "${{ steps.meta.outputs.tags }}"
diff --git a/.forgejo/release.yml b/.forgejo/workflows/release.yml
similarity index 78%
rename from .forgejo/release.yml
rename to .forgejo/workflows/release.yml
index 6309fe5..340276d 100644
--- a/.forgejo/release.yml
+++ b/.forgejo/workflows/release.yml
@@ -21,9 +21,17 @@ jobs:
       - name: Check out the repo
         uses: https://github.com/actions/checkout@v4
       - name: Get Metadata For Docker
+        id: meta
         uses: https://github.com/docker/metadata-action@v5
         with:
-          images: ${{ github.repository }}
+          images: forgejo.merr.is/${{ github.repository }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+          labels: |
+            org.opencontainers.image.licenses=MIT
       - name: Set up Docker Buildx
         uses: https://github.com/docker/setup-buildx-action@v3
         with:
@@ -40,8 +48,9 @@ jobs:
         uses: https://github.com/docker/build-push-action@v5
         with:
           context: .
-          push: true
-          tags: forgejo.merr.is/${{ github.repository }}:${{ github.head_ref || github.ref_name }}.${{ github.run_number }}
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
       - name: Extract Binary For Release
         uses: https://github.com/moosetheory/actions-docker-extract@v3.1
         id: extract