fix: Pulling in changes from working implementation

Author: yhakbar

.github/scripts/release/check-edit-meaningful.sh

@@ -2,58 +2,39 @@
 
 set -euo pipefail
 
-# Script to resolve the release version and target ref from either a
-# release event or a workflow_dispatch input.
-#
-# For workflow_dispatch: looks up the existing draft release by version
-# and extracts the target commitish.
-# For release events: reads version and ref directly from event context.
+# Script to resolve the release version and target ref from a
+# workflow_dispatch input by looking up the existing draft release.
 #
 # Usage: resolve-version-ref.sh
 # Environment variables:
-#   EVENT_NAME: GitHub event name (workflow_dispatch or release)
-#   INPUT_VERSION: Version provided via workflow_dispatch (required for workflow_dispatch)
-#   RELEASE_TAG_NAME: Tag name from the release event (required for release events)
-#   RELEASE_TARGET: Target commitish from the release event (required for release events)
-#   GH_TOKEN: GitHub token for authentication (required for workflow_dispatch)
+#   INPUT_VERSION: Version provided via workflow_dispatch (required)
+#   GH_TOKEN: GitHub token for authentication (required)
 #   GITHUB_OUTPUT: Path to GitHub output file
 
 function main {
-  : "${EVENT_NAME:?ERROR: EVENT_NAME is a required environment variable}"
+  : "${INPUT_VERSION:?ERROR: INPUT_VERSION is a required environment variable}"
+  : "${GH_TOKEN:?ERROR: GH_TOKEN is a required environment variable}"
   : "${GITHUB_OUTPUT:?ERROR: GITHUB_OUTPUT is a required environment variable}"
 
-  local version
-  local ref
-
-  if [[ "$EVENT_NAME" == "workflow_dispatch" ]]; then
-    : "${INPUT_VERSION:?ERROR: INPUT_VERSION is required for workflow_dispatch}"
-    : "${GH_TOKEN:?ERROR: GH_TOKEN is required for workflow_dispatch}"
-
-    version="$INPUT_VERSION"
-
-    # Look up the release to get target_commitish
-    local release_json
-    if ! release_json=$(gh release view "$version" --json 'isDraft,targetCommitish' 2>/dev/null); then
-      echo "ERROR: No release found for version $version" >&2
-      exit 1
-    fi
+  local version="$INPUT_VERSION"
 
-    local is_draft
-    is_draft=$(jq -r '.isDraft' <<<"$release_json")
-    if [[ "$is_draft" != "true" ]]; then
-      echo "ERROR: Release $version is already published. Cannot rebuild a published release." >&2
-      exit 1
-    fi
-
-    ref=$(jq -r '.targetCommitish' <<<"$release_json")
-  else
-    : "${RELEASE_TAG_NAME:?ERROR: RELEASE_TAG_NAME is required for release events}"
-    : "${RELEASE_TARGET:?ERROR: RELEASE_TARGET is required for release events}"
+  # Look up the release to get target_commitish
+  local release_json
+  if ! release_json=$(gh release view "$version" --json 'isDraft,targetCommitish' 2>/dev/null); then
+    echo "ERROR: No release found for version $version" >&2
+    exit 1
+  fi
 
-    version="$RELEASE_TAG_NAME"
-    ref="$RELEASE_TARGET"
+  local is_draft
+  is_draft=$(jq -r '.isDraft' <<<"$release_json")
+  if [[ "$is_draft" != "true" ]]; then
+    echo "ERROR: Release $version is already published. Cannot rebuild a published release." >&2
+    exit 1
   fi
 
+  local ref
+  ref=$(jq -r '.targetCommitish' <<<"$release_json")
+
   {
     printf 'version=%s\n' "$version"
     printf 'ref=%s\n' "$ref"

.github/scripts/release/resolve-version-ref.sh

@@ -1,12 +1,10 @@
 name: Release
 
 on:
-  release:
-    types: [created, edited]
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version to rebuild (must match an existing draft release, e.g., v1.0.2)'
+        description: 'Version to build (must match an existing draft release, e.g., v1.0.2)'
         required: true
         type: string
 
@@ -15,50 +13,28 @@ jobs:
   # targeting an explicit commit SHA.
   validate:
     name: Validate Release
-    # For release events, only run for draft releases.
-    # For workflow_dispatch, always run (we check draft status in a step).
-    if: github.event_name == 'workflow_dispatch' || github.event.release.draft == true
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.resolve.outputs.version }}
       ref: ${{ steps.resolve.outputs.ref }}
-      skip: ${{ steps.check_changes.outputs.skip }}
 
     steps:
       - name: Checkout code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          # For release events on drafts, GITHUB_REF points to a tag that
-          # doesn't exist yet. Use the release target or fall back to the
-          # default branch for workflow_dispatch.
-          ref: ${{ github.event.release.target_commitish || github.sha }}
-
-      - name: Check if edit is meaningful
-        id: check_changes
-        if: github.event.action == 'edited'
-        env:
-          CHANGES_JSON: ${{ toJSON(github.event.changes) }}
-        run: .github/scripts/release/check-edit-meaningful.sh
 
       - name: Resolve version and ref
         id: resolve
-        if: steps.check_changes.outputs.skip != 'true'
         env:
-          EVENT_NAME: ${{ github.event_name }}
           INPUT_VERSION: ${{ inputs.version }}
-          RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
-          RELEASE_TARGET: ${{ github.event.release.target_commitish }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: .github/scripts/release/resolve-version-ref.sh
 
       - name: Validate semver
-        if: steps.check_changes.outputs.skip != 'true'
         env:
           VERSION: ${{ steps.resolve.outputs.version }}
         run: .github/scripts/release/validate-semver.sh "$VERSION"
 
       - name: Enforce commit SHA target
-        if: steps.check_changes.outputs.skip != 'true'
         env:
           REF: ${{ steps.resolve.outputs.ref }}
         run: .github/scripts/release/enforce-commit-sha.sh "$REF"
@@ -67,7 +43,6 @@ jobs:
   build-and-sign:
     name: Build and Sign All Binaries
     needs: validate
-    if: needs.validate.outputs.skip != 'true'
     uses: ./.github/workflows/build.yml
     with:
       version: ${{ needs.validate.outputs.version }}
@@ -83,7 +58,6 @@ jobs:
   upload-assets:
     name: Upload Release Assets
     needs: [validate, build-and-sign]
-    if: needs.validate.outputs.skip != 'true'
     runs-on: ubuntu-latest
     permissions:
       contents: write

.github/workflows/release.yml

@@ -38,9 +38,9 @@ To release a new version of Terragrunt:
 
 4. Set the release title to the version tag (e.g., `v1.0.2`).
 
-5. Click **Save draft**. This automatically triggers the Release workflow via the `release: created` event.
+5. Click **Save draft**.
 
-6. Monitor the [GitHub Actions workflow run](https://github.com/gruntwork-io/terragrunt/actions/workflows/release.yml). It will:
+6. Trigger the [Release workflow](https://github.com/gruntwork-io/terragrunt/actions/workflows/release.yml) via **Run workflow**, providing the version string you just drafted (e.g., `v1.0.2`). The workflow looks up the draft release, reads its target commit SHA, and will:
    - Validate the tag is a valid semantic version
    - Verify the target is a commit SHA (not a branch name)
    - Build binaries for every supported OS and architecture
@@ -52,8 +52,8 @@ To release a new version of Terragrunt:
 
 8. Write or finalize the release notes.
 
-<Aside type="caution" title="Editing a draft triggers a rebuild">
-  Editing a draft release (other than just updating the release notes) will re-trigger the build workflow to ensure assets always match the current release configuration. Release note edits alone do not trigger a rebuild.
+<Aside type="note" title="Re-running after edits">
+  If you edit the draft (for example, to retarget a new commit SHA), re-run the Release workflow with the same version to rebuild and overwrite the assets. Editing the draft does not automatically trigger a rebuild.
 </Aside>
 
 9. When ready:
@@ -64,10 +64,7 @@ To release a new version of Terragrunt:
 
 ### Retrying a Failed Build
 
-If the build workflow fails mid-way:
-
-- **Edit the draft** (e.g., point it at a new commit) to re-trigger the workflow. Assets are automatically overwritten.
-- Alternatively, use the **workflow_dispatch** trigger on the Release workflow, providing the version string (e.g., `v1.0.2`). This looks up the existing draft release and rebuilds.
+If the build workflow fails mid-way, re-run the Release workflow via **workflow_dispatch** with the same version (e.g., `v1.0.2`). It looks up the existing draft release and rebuilds, overwriting any previously uploaded assets.
 
 ## Pre-releases