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

---
 .github/workflows/RunTests.yml                  |  3 ++-
 .github/workflows/run_tests_against_package.yml | 12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/RunTests.yml b/.github/workflows/RunTests.yml
index 3787f22074..ee8dd7821f 100644
--- a/.github/workflows/RunTests.yml
+++ b/.github/workflows/RunTests.yml
@@ -209,8 +209,9 @@ jobs:
           env:
             GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             GH_REPO: ${{ github.repository }}
+            STEPS_FIND_ISSUE_OUTPUTS_ISSUE_NUMBER: ${{ steps.find_issue.outputs.issue_number }}
           run: |
-            ISSUE_NUMBER=${{ steps.find_issue.outputs.issue_number }}
+            ISSUE_NUMBER=${STEPS_FIND_ISSUE_OUTPUTS_ISSUE_NUMBER}
             LABELS=$(gh issue view $ISSUE_NUMBER --json labels -q '.labels[].name')
 
             if echo "$LABELS" | grep -q "success-run-2"; then
diff --git a/.github/workflows/run_tests_against_package.yml b/.github/workflows/run_tests_against_package.yml
index 4cd66dbd82..35d0879159 100644
--- a/.github/workflows/run_tests_against_package.yml
+++ b/.github/workflows/run_tests_against_package.yml
@@ -87,10 +87,10 @@ jobs:
       - name: Run Tests
         shell: bash
         run: |
-          if [ "${{ inputs.is_scheduled_run }}" == "true" ]; then
-            FINAL_PYTEST_MARKER="${{ inputs.pytest_marker }}"
+          if [ "${INPUTS_IS_SCHEDULED_RUN}" == "true" ]; then
+            FINAL_PYTEST_MARKER="${INPUTS_PYTEST_MARKER}"
           else
-            FINAL_PYTEST_MARKER="${{ inputs.pytest_marker }} and not scheduled_only"
+            FINAL_PYTEST_MARKER="${INPUTS_PYTEST_MARKER} and not scheduled_only"
           fi
           # TODO: Use package data for testing and remove the env vars
           export MAXTEXT_REPO_ROOT=$(pwd)
@@ -98,4 +98,8 @@ jobs:
           export MAXTEXT_TEST_ASSETS_ROOT=$(pwd)/src/MaxText/test_assets
           export MAXTEXT_PKG_DIR=$(pwd)/src/MaxText
           # TODO: Fix the skipped tests and remove the deselect flags
-          .venv/bin/python3 -m pytest ${{ inputs.pytest_addopts }} -v -m "${FINAL_PYTEST_MARKER}" --durations=0 --deselect "tests/aot_hlo_identical_test.py::AotHloIdenticalTest::test_default_hlo_match" --deselect "tests/tokenizer_test.py::TokenizerTest::test_detokenize"
+          .venv/bin/python3 -m pytest ${INPUTS_PYTEST_ADDOPTS} -v -m "${FINAL_PYTEST_MARKER}" --durations=0 --deselect "tests/aot_hlo_identical_test.py::AotHloIdenticalTest::test_default_hlo_match" --deselect "tests/tokenizer_test.py::TokenizerTest::test_detokenize"
+        env:
+          INPUTS_IS_SCHEDULED_RUN: ${{ inputs.is_scheduled_run }}
+          INPUTS_PYTEST_MARKER: ${{ inputs.pytest_marker }}
+          INPUTS_PYTEST_ADDOPTS: ${{ inputs.pytest_addopts }}