From 68b000fbe7cc3551eb64c04864329e4dd68dceb6 Mon Sep 17 00:00:00 2001
From: Scott Dixon <dixonsco@amazon.com>
Date: Fri, 28 Feb 2025 09:55:49 -0800
Subject: [PATCH] Trying to fix meta data on release of #ts container

---
 .github/workflows/texer.yml    | 11 +++++++----
 .github/workflows/toolshed.yml |  7 ++++---
 .github/workflows/toxic.yml    |  5 ++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/texer.yml b/.github/workflows/texer.yml
index aedcc14..20211ea 100644
--- a/.github/workflows/texer.yml
+++ b/.github/workflows/texer.yml
@@ -17,6 +17,9 @@ jobs:
   build_and_publish:
 
     runs-on: ubuntu-latest
+    if: >
+          ( github.event_name == 'pull_request' && contains(github.event.pull_request.title, '#te')) ||
+          ( github.event_name == 'release' && startsWith(github.ref, 'refs/tags/te'))
 
     steps:
     - uses: actions/checkout@v3
@@ -27,12 +30,12 @@ jobs:
       with:
         tagRegex: "(${{ env.IMAGE_VERSION_PREFIX }}).*"
     - name: dryrun-build
-      if: >
-          ( github.event_name == 'pull_request' && contains(github.event.pull_request.title, '#te')) ||
-          ( github.event_name == 'release' && startsWith(github.ref, 'refs/tags/te'))
       run: docker build ./${{ env.IMAGE_NAME }}
     - name: build-and-push
-      if: ${{ github.event_name == 'release' && startsWith( steps.process_event.outputs.tag, env.IMAGE_VERSION_PREFIX ) && !github.event.release.prerelease }}
+      if: >
+        github.event_name == 'release' &&
+        startsWith( steps.process_event.outputs.tag, env.IMAGE_VERSION_PREFIX ) &&
+        !github.event.release.prerelease
       uses: macbre/push-to-ghcr@master
       with:
         context: ./${{ env.IMAGE_NAME }}
diff --git a/.github/workflows/toolshed.yml b/.github/workflows/toolshed.yml
index 64a7dd0..15fe557 100644
--- a/.github/workflows/toolshed.yml
+++ b/.github/workflows/toolshed.yml
@@ -54,7 +54,6 @@ jobs:
         context: toolshed
         platforms: ${{ matrix.platform }}
         labels: ${{ steps.meta.outputs.labels }}
-        tags: ${{ steps.meta.outputs.tags }}
         annotations: ${{ steps.meta.outputs.annotations }}
         outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=${{ (github.event_name != 'pull_request' &&  !github.event.release.prerelease) && 'true' || 'false' }}
 
@@ -116,7 +115,6 @@ jobs:
         context: toolshed
         platforms: ${{ matrix.platform }}
         labels: ${{ steps.meta.outputs.labels }}
-        tags: ${{ steps.meta.outputs.tags }}
         annotations: ${{ steps.meta.outputs.annotations }}
         outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=${{ (github.event_name != 'pull_request' &&  !github.event.release.prerelease) && 'true' || 'false' }}
 
@@ -137,7 +135,10 @@ jobs:
         retention-days: 1
 
   merge-ts:
-    if: ${{ github.event_name == 'release' && startsWith( github.ref, 'refs/tags/ts' ) && !github.event.release.prerelease }}
+    if: >
+      github.event_name == 'release' &&
+      startsWith( github.ref, 'refs/tags/ts' ) &&
+      !github.event.release.prerelease
     runs-on: ubuntu-latest
     needs:
       - release-ts-amd64
diff --git a/.github/workflows/toxic.yml b/.github/workflows/toxic.yml
index a8decd2..9b7b5f3 100644
--- a/.github/workflows/toxic.yml
+++ b/.github/workflows/toxic.yml
@@ -79,7 +79,10 @@ jobs:
         retention-days: 1
 
   merge-tx:
-    if: ${{ github.event_name == 'release' && startsWith( github.ref, 'refs/tags/tx' ) && !github.event.release.prerelease }}
+    if: >
+      github.event_name == 'release' &&
+      startsWith( github.ref, 'refs/tags/tx' ) &&
+      !github.event.release.prerelease
     runs-on: ubuntu-latest
     needs:
       - release-tx