diff --git a/.github/workflows/external-account-integration.yml b/.github/workflows/external-account-integration.yml index bd8b774a1424b..07154f14f7645 100644 --- a/.github/workflows/external-account-integration.yml +++ b/.github/workflows/external-account-integration.yml @@ -54,9 +54,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 diff --git a/.github/workflows/windows-cmake.yml b/.github/workflows/windows-cmake.yml index e877e1660368b..6c8f5bb745b8c 100644 --- a/.github/workflows/windows-cmake.yml +++ b/.github/workflows/windows-cmake.yml @@ -104,9 +104,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: @@ -120,11 +122,14 @@ 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' - 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 }} env: SCCACHE_GCS_BUCKET: cloud-cpp-gha-cache SCCACHE_GCS_KEY_PREFIX: sccache/${{ matrix.msvc }}/${{ matrix.arch}}/${{ matrix.build_type }}