From 4839dbb36250075d57a320a863d0012f3bd7001a Mon Sep 17 00:00:00 2001
From: Simon Thulbourn <sthulb@users.noreply.github.com>
Date: Wed, 7 May 2025 17:35:53 +0000
Subject: [PATCH] fix(ci): Update control flow to allow for better skipping of
 things

---
 .github/workflows/release.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3b650f105..f6228a1af 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -67,7 +67,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       version: ${{ format('{0}{1}', steps.version_release.outputs.version, steps.version_snapshot.outputs.version) }}
-      build_matrix: ${{ format('{0}{1}', steps.build_matrix_v1.outputs.build_matrix, steps.build_matrix_v1.outputs.build_matrix) }}
+      build_matrix: ${{ format('{0}{1}', steps.build_matrix_v1.outputs.build_matrix, steps.build_matrix_v2.outputs.build_matrix) }}
     steps:
       - id: version_snapshot
         if: ${{ inputs.snapshot }}
@@ -161,6 +161,7 @@ jobs:
       - setup
       - quality
       - version_seal
+    if: ${{ always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
     strategy:
       matrix:
         java: ${{ fromJson(needs.setup.outputs.build_matrix) }}
@@ -183,7 +184,7 @@ jobs:
 
   publish:
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'aws-powertools/powertools-lambda-java' }}
+    if: ${{ github.repository == 'aws-powertools/powertools-lambda-java' && inputs.skip_publish == false }}
     needs:
       - build
     environment: Release
@@ -210,7 +211,7 @@ jobs:
   
   create_pr:
     runs-on: ubuntu-latest
-    if: ${{ inputs.snapshot == false }}
+    if: ${{ inputs.snapshot == false && always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
     needs:
       - build
       - publish