More tweaks to address code reviews

Signed-off-by: Emiliano Suñé <emiliano.sune@gmail.com>

Author: esune

.github/workflows/tag-recreate-lts.yml

@@ -28,8 +28,8 @@ jobs:
     name: Recreate LTS Release
     runs-on: ubuntu-latest
     outputs:
-      lts_tag: ${{ steps.vars.outputs.LTS_TAG }}
-      release_tag: ${{ steps.set_release_tag.outputs.release_tag }}
+      lts_tag: ${{ steps.set_outputs.outputs.lts_tag }}
+      release_tag: ${{ steps.set_outputs.outputs.release_tag }}
 
     steps:
       - name: Checkout repository
@@ -86,9 +86,14 @@ jobs:
 
       - name: Check if Release is LTS
         id: check_lts
-        if: github.event_name == 'workflow_run' && steps.get_release.outputs.skip != 'true'
+        if: steps.get_release.outputs.skip != 'true' || github.event_name == 'workflow_dispatch'
         run: |
-          RELEASE_TAG="${{ steps.get_release.outputs.release_tag }}"
+          # Get release tag based on trigger type
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            RELEASE_TAG="${{ inputs.release_tag }}"
+          else
+            RELEASE_TAG="${{ steps.get_release.outputs.release_tag }}"
+          fi
           
           # Read LTS versions from config file (remove comments and empty lines)
           LTS_VERSIONS=$(grep -v '^#' .github/lts-versions.txt | grep -v '^$' | tr '\n' '|' | sed 's/|$//')
@@ -132,14 +137,36 @@ jobs:
           echo "release_tag=$RELEASE_TAG" >> "$GITHUB_OUTPUT"
           echo "Validated release tag: $RELEASE_TAG"
 
+      - name: Determine if workflow should proceed
+        id: should_proceed
+        run: |
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            # workflow_dispatch: check LTS validation result
+            if [ "${{ steps.check_lts.outputs.skip }}" == "true" ]; then
+              echo "proceed=false" >> "$GITHUB_OUTPUT"
+              echo "Skipping: Release is not configured as LTS"
+            else
+              echo "proceed=true" >> "$GITHUB_OUTPUT"
+              echo "Proceeding with workflow_dispatch"
+            fi
+          elif [ "${{ steps.get_release.outputs.skip }}" == "true" ] || [ "${{ steps.check_lts.outputs.skip }}" == "true" ]; then
+            # workflow_run: skip if either check failed
+            echo "proceed=false" >> "$GITHUB_OUTPUT"
+            echo "Skipping: release check or LTS check failed"
+          else
+            # workflow_run: proceed if both checks passed
+            echo "proceed=true" >> "$GITHUB_OUTPUT"
+            echo "Proceeding with workflow_run"
+          fi
+
       - name: Set up Git identity
-        if: github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && steps.get_release.outputs.skip != 'true' && steps.check_lts.outputs.skip != 'true')
+        if: steps.should_proceed.outputs.proceed == 'true'
         run: |
           git config user.name "github-actions"
           git config user.email "github-actions@github.com"
 
       - name: Determine LTS tag and update
-        if: github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && steps.get_release.outputs.skip != 'true' && steps.check_lts.outputs.skip != 'true')
+        if: steps.should_proceed.outputs.proceed == 'true'
         id: vars
         env:
           RELEASE_TAG: ${{ steps.set_release_tag.outputs.release_tag }}
@@ -152,8 +179,12 @@ jobs:
           LTS_TAG="${SHORT_TAG}-lts"
           echo "LTS_TAG=$LTS_TAG" >> "$GITHUB_OUTPUT"
 
-          # Force update the tag to the current commit
-          git tag -f "$LTS_TAG" $GITHUB_SHA
+          # Get the commit SHA that the release tag points to
+          RELEASE_SHA=$(git rev-parse "$RELEASE_TAG^{}")
+          echo "Release tag $RELEASE_TAG points to commit: $RELEASE_SHA"
+          
+          # Force update the LTS tag to point to the same commit as the release
+          git tag -f "$LTS_TAG" "$RELEASE_SHA"
           git push origin -f "$LTS_TAG"
           
           # Get release body from the original release
@@ -165,7 +196,7 @@ jobs:
           echo "EOF" >> "$GITHUB_ENV"
 
       - name: Delete existing LTS release (if any)
-        if: github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && steps.get_release.outputs.skip != 'true' && steps.check_lts.outputs.skip != 'true')
+        if: steps.should_proceed.outputs.proceed == 'true'
         continue-on-error: true
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -175,14 +206,22 @@ jobs:
           gh release delete "$LTS_TAG" -y
 
       - name: Create fresh LTS release
-        if: github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && steps.get_release.outputs.skip != 'true' && steps.check_lts.outputs.skip != 'true')
+        if: steps.should_proceed.outputs.proceed == 'true'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           LTS_TAG: ${{ steps.vars.outputs.LTS_TAG }}
           RELEASE_BODY: ${{ env.RELEASE_BODY }}
         run: |
           echo "Creating new GitHub release for $LTS_TAG"
           gh release create "$LTS_TAG" --title "$LTS_TAG" --notes "$RELEASE_BODY"
+
+      - name: Set Job Outputs
+        id: set_outputs
+        if: steps.should_proceed.outputs.proceed == 'true'
+        run: |
+          echo "lts_tag=${{ steps.vars.outputs.LTS_TAG }}" >> "$GITHUB_OUTPUT"
+          echo "release_tag=${{ steps.set_release_tag.outputs.release_tag }}" >> "$GITHUB_OUTPUT"
+          echo "Set job outputs for downstream job"
   
   tag-lts-images:
     name: Tag Existing Images with LTS