Refactor Github Action per b/485167538

Author: benknutson-google

.github/workflows/external-account-integration.yml

@@ -56,9 +56,11 @@ jobs:
       working-directory: "${{runner.temp}}"
       run: |
         mkdir -p vcpkg
-        curl -fsSL "https://github.com/microsoft/vcpkg/archive/${{ steps.vcpkg-version.outputs.version }}.tar.gz" |
+        curl -fsSL "https://github.com/microsoft/vcpkg/archive/${STEPS_VCPKG_VERSION_OUTPUTS_VERSION}.tar.gz" |
             tar -C vcpkg --strip-components=1 -zxf -
         vcpkg/bootstrap-vcpkg.sh -disableMetrics
+      env:
+        STEPS_VCPKG_VERSION_OUTPUTS_VERSION: ${{ steps.vcpkg-version.outputs.version }}
     # First compile the code using the identity with access to the build cache
     - run: |
         env VCPKG_ROOT="${{ runner.temp }}/vcpkg" ci/gha/builds/external-account.sh

.github/workflows/test-runner.yml

@@ -39,9 +39,13 @@ jobs:
         run: |
           echo "event=${{ github.event_name }}"
           echo "assoc=${{ github.event.pull_request.author_association }}"
-          echo "org=${{ github.organization }}" || true
-          echo "user=${{ github.event.pull_request.user }}" || true
-          echo "user_orgs=${{ github.event.pull_request.user.organizations_url }}" || true
+          echo "org=${GITHUB_ORGANIZATION}" || true
+          echo "user=${GITHUB_EVENT_PULL_REQUEST_USER}" || true
+          echo "user_orgs=${GITHUB_EVENT_PULL_REQUEST_USER_ORGANIZATIONS_URL}" || true
+        env:
+          GITHUB_ORGANIZATION: ${{ github.organization }}
+          GITHUB_EVENT_PULL_REQUEST_USER: ${{ github.event.pull_request.user }}
+          GITHUB_EVENT_PULL_REQUEST_USER_ORGANIZATIONS_URL: ${{ github.event.pull_request.user.organizations_url }}
 
   pre-flight:
     # Save the `ref` of the pull request, so downstream jobs know what to checkout.

.github/workflows/windows-bazel.yml

@@ -97,9 +97,11 @@ jobs:
         # Using a short name like this avoids the problem in most cases.
         mkdir -p 'c:\b' || true
         export BAZEL_ROOT='c:\b'
-        export BAZEL_REMOTE_CACHE_RW_MODE=${{ inputs.bazel-cache-mode }}
+        export BAZEL_REMOTE_CACHE_RW_MODE=${INPUTS_BAZEL_CACHE_MODE}
         export EXECUTE_INTEGRATION_TESTS=${{ inputs.execute-integration-tests }}
         ci/gha/builds/windows-bazel.sh ${{ matrix.compilation_mode }} ${{ join(matrix.targets, ' ') }}
+      env:
+        INPUTS_BAZEL_CACHE_MODE: ${{ inputs.bazel-cache-mode }}
     - name: Post Build Disk Space
       shell: bash
       run: df -m

.github/workflows/windows-cmake.yml

@@ -295,9 +295,11 @@ jobs:
       run: |
         cd "${TEMP}"
         mkdir -p .build/vcpkg
-        curl -fsSL "https://github.com/microsoft/vcpkg/archive/${{ steps.dynamic.outputs.vcpkg-version }}.tar.gz" |
+        curl -fsSL "https://github.com/microsoft/vcpkg/archive/${STEPS_DYNAMIC_OUTPUTS_VCPKG_VERSION}.tar.gz" |
             tar -C .build/vcpkg --strip-components=1 -zxf -
         .build/vcpkg/bootstrap-vcpkg.sh -disableMetrics
+      env:
+        STEPS_DYNAMIC_OUTPUTS_VCPKG_VERSION: ${{ steps.dynamic.outputs.vcpkg-version }}
     # go/github-actions#gha-bestpractices explains why we use a SHA instead of
     # a named version for this runner. We could avoid using this runner with the
     # ideas from:
@@ -311,12 +313,15 @@ jobs:
       shell: bash
       run: |
         export VCPKG_ROOT="${TEMP}/.build/vcpkg"
-        export CLOUDSDK_PYTHON="${{ steps.py311.outputs.python-path }}"
+        export CLOUDSDK_PYTHON="${STEPS_PY311_OUTPUTS_PYTHON_PATH}"
         # Put the CMake output in a directory with more space and keep it short
         # to avoid running into the MSVC limits.
         export CMAKE_OUT='c:\b'
         export EXECUTE_INTEGRATION_TESTS=${{ inputs.execute-integration-tests }}
-        ci/gha/builds/windows-cmake.sh ${{ matrix.build_type }} ${{ steps.dynamic.outputs.features }}
+        ci/gha/builds/windows-cmake.sh ${{ matrix.build_type }} ${STEPS_DYNAMIC_OUTPUTS_FEATURES}
+      env:
+        STEPS_PY311_OUTPUTS_PYTHON_PATH: ${{ steps.py311.outputs.python-path }}
+        STEPS_DYNAMIC_OUTPUTS_FEATURES: ${{ steps.dynamic.outputs.features }}
     - name: Post Build Disk Space
       shell: bash
       run: df -m