From ff908aa9036c0036654659e0cfbe1e3adc33ed43 Mon Sep 17 00:00:00 2001
From: Ben Knutson <benknutson@google.com>
Date: Wed, 18 Feb 2026 03:09:22 +0000
Subject: [PATCH] Refactor Github Action per b/485167538

---
 .github/workflows/prepare-release.yml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 214df2f..5784210 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -21,30 +21,38 @@ jobs:
 
       - name: Check input
         run: |
-          echo '* input Jib extension: "${{ github.event.inputs.jib_extension }}"'
+          echo '* input Jib extension: "${GITHUB_EVENT_INPUTS_JIB_EXTENSION}"'
 
-          if [[ ! "${{ github.event.inputs.release_version }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            echo 'version "${{ github.event.inputs.release_version }}" not in ###.###.### format'
+          if [[ ! "${GITHUB_EVENT_INPUTS_RELEASE_VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo 'version "${GITHUB_EVENT_INPUTS_RELEASE_VERSION}" not in ###.###.### format'
             exit 1
           fi
+        env:
+          GITHUB_EVENT_INPUTS_JIB_EXTENSION: ${{ github.event.inputs.jib_extension }}
+          GITHUB_EVENT_INPUTS_RELEASE_VERSION: ${{ github.event.inputs.release_version }}
 
       - name: Build Jib extension
         run: |
           cd first-party
-          ./gradlew clean ${{ github.event.inputs.jib_extension }}:integrationTest --stacktrace
+          ./gradlew clean ${GITHUB_EVENT_INPUTS_JIB_EXTENSION}:integrationTest --stacktrace
+        env:
+          GITHUB_EVENT_INPUTS_JIB_EXTENSION: ${{ github.event.inputs.jib_extension }}
 
       - name: Run Gradle release
         run: |
-          git checkout -b ${{ github.event.inputs.jib_extension }}-release-v${{ github.event.inputs.release_version }}
-          git config user.email ${{ github.actor }}@users.noreply.github.com
-          git config user.name ${{ github.actor }}
+          git checkout -b ${GITHUB_EVENT_INPUTS_JIB_EXTENSION}-release-v${GITHUB_EVENT_INPUTS_RELEASE_VERSION}
+          git config user.email ${GITHUB_ACTOR}@users.noreply.github.com
+          git config user.name ${GITHUB_ACTOR}
 
           cd first-party
           # This creates the tag (e.g., "v0.2.0-jib-layer-filter-extension-gradle") and pushes the updated
           # branch (e.g., "jib-layer-filter-extension-gradle-release-v0.2.0") and the new tag.
-          ./gradlew ${{ github.event.inputs.jib_extension }}:release \
+          ./gradlew ${GITHUB_EVENT_INPUTS_JIB_EXTENSION}:release \
             -Prelease.useAutomaticVersion=true \
-            -Prelease.releaseVersion=${{ github.event.inputs.release_version }}
+            -Prelease.releaseVersion=${GITHUB_EVENT_INPUTS_RELEASE_VERSION}
+        env:
+          GITHUB_EVENT_INPUTS_JIB_EXTENSION: ${{ github.event.inputs.jib_extension }}
+          GITHUB_EVENT_INPUTS_RELEASE_VERSION: ${{ github.event.inputs.release_version }}
 
       - name: Create pull request
         uses: repo-sync/pull-request@v2.6.2