From 3ccfcc3d589d75566526753bedc2f2024a8394e0 Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Tue, 14 Apr 2026 08:48:17 +0100 Subject: [PATCH] Use env vars instead of template expressions --- .github/workflows/check_labels.yml | 3 ++- .github/workflows/comment_bot.yml | 4 ++-- .github/workflows/cpp_windows.yml | 11 ++++++++--- .github/workflows/integration.yml | 3 ++- .github/workflows/pr_bot.yml | 12 +++++++----- .github/workflows/python.yml | 4 +++- .github/workflows/verify_rc.yml | 3 ++- 7 files changed, 26 insertions(+), 14 deletions(-) diff --git a/.github/workflows/check_labels.yml b/.github/workflows/check_labels.yml index e26945114db5..c7cc7fc52209 100644 --- a/.github/workflows/check_labels.yml +++ b/.github/workflows/check_labels.yml @@ -52,6 +52,7 @@ jobs: id: check env: GH_TOKEN: ${{ github.token }} + PARENT_WORKFLOW: ${{ inputs.parent-workflow }} run: | set -ex case "${GITHUB_EVENT_NAME}" in @@ -71,7 +72,7 @@ jobs: git diff --stat origin/${GITHUB_BASE_REF}.. if git diff --stat origin/${GITHUB_BASE_REF}.. | \ grep \ - --fixed-strings ".github/workflows/${{ inputs.parent-workflow }}.yml" \ + --fixed-strings ".github/workflows/${PARENT_WORKFLOW}.yml" \ --quiet; then echo "force=true" >> "${GITHUB_OUTPUT}" fi diff --git a/.github/workflows/comment_bot.yml b/.github/workflows/comment_bot.yml index 7cfead4dce4a..35fb1078e47a 100644 --- a/.github/workflows/comment_bot.yml +++ b/.github/workflows/comment_bot.yml @@ -53,8 +53,8 @@ jobs: CROSSBOW_GITHUB_TOKEN: ${{ secrets.CROSSBOW_GITHUB_TOKEN }} run: | archery --debug trigger-bot \ - --event-name ${{ github.event_name }} \ - --event-payload ${{ github.event_path }} + --event-name "${GITHUB_EVENT_NAME}" \ + --event-payload "${GITHUB_EVENT_PATH}" issue_assign: name: "Assign issue" diff --git a/.github/workflows/cpp_windows.yml b/.github/workflows/cpp_windows.yml index 3bbf814626b1..96b0035f8764 100644 --- a/.github/workflows/cpp_windows.yml +++ b/.github/workflows/cpp_windows.yml @@ -114,13 +114,18 @@ jobs: restore-keys: cpp-ccache-windows-${{ inputs.arch }}- - name: Build shell: cmd + env: + VCVARS_ARCH: ${{ inputs.arch }} run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ inputs.arch }} + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_ARCH% bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build" - name: Test shell: cmd + env: + VCVARS_ARCH: ${{ inputs.arch }} + MSYS2_LOCATION: ${{ steps.setup-msys2.outputs.msys2-location }} run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ inputs.arch }} + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_ARCH% # For ORC - set TZDIR=${{ steps.setup-msys2.outputs.msys2-location }}\usr\share\zoneinfo + set TZDIR=%MSYS2_LOCATION%\usr\share\zoneinfo bash -c "ci/scripts/cpp_test.sh $(pwd) $(pwd)/build" diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 583a7009adc5..cca2d502ede5 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -119,10 +119,11 @@ jobs: env: ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }} ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} + DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} run: | source ci/scripts/util_enable_core_dumps.sh archery docker run \ - -e ARCHERY_DEFAULT_BRANCH=${{ github.event.repository.default_branch }} \ + -e ARCHERY_DEFAULT_BRANCH="${DEFAULT_BRANCH}" \ -e ARCHERY_INTEGRATION_WITH_DOTNET=1 \ -e ARCHERY_INTEGRATION_WITH_GO=1 \ -e ARCHERY_INTEGRATION_WITH_JAVA=1 \ diff --git a/.github/workflows/pr_bot.yml b/.github/workflows/pr_bot.yml index 7a6d44853063..011bc871b28f 100644 --- a/.github/workflows/pr_bot.yml +++ b/.github/workflows/pr_bot.yml @@ -90,16 +90,18 @@ jobs: - name: Handle PR workflow event env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_REVIEW_PATH: ${{ steps.extract.outputs.pr_review_path }} + COMMITTERS_PATH: ${{ steps.committers.outputs.committers_path }} run: | if [ "${GITHUB_EVENT_NAME}" = "workflow_run" ]; then # workflow_run is executed on PR review. Update to original event. archery trigger-bot \ --event-name "pull_request_review" \ - --event-payload "${{ steps.extract.outputs.pr_review_path }}" \ - --committers-file "${{ steps.committers.outputs.committers_path }}" + --event-payload "${PR_REVIEW_PATH}" \ + --committers-file "${COMMITTERS_PATH}" else archery trigger-bot \ - --event-name "${{ github.event_name }}" \ - --event-payload "${{ github.event_path }}" \ - --committers-file "${{ steps.committers.outputs.committers_path }}" + --event-name "${GITHUB_EVENT_NAME}" \ + --event-payload "${GITHUB_EVENT_PATH}" \ + --committers-file "${COMMITTERS_PATH}" fi diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index aa333606529b..348d8085e252 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -297,8 +297,10 @@ jobs: CACHE_VERSION: "2025-09-16.1" - name: Build Arrow C++ and PyArrow shell: cmd + env: + USR_WINDOWS_DIR: ${{ steps.path-info.outputs.usr-windows-dir }} run: | - call "ci\scripts\python_build.bat" %cd% "${{ steps.path-info.outputs.usr-windows-dir }}" + call "ci\scripts\python_build.bat" %cd% "%USR_WINDOWS_DIR%" - name: Test PyArrow shell: cmd run: | diff --git a/.github/workflows/verify_rc.yml b/.github/workflows/verify_rc.yml index e88b8ca8f239..0f5c60165012 100644 --- a/.github/workflows/verify_rc.yml +++ b/.github/workflows/verify_rc.yml @@ -52,10 +52,11 @@ jobs: id: detect env: GH_TOKEN: ${{ github.token }} + RC_TAG: ${{ inputs.rc_tag }} run: | case "${GITHUB_EVENT_NAME}" in workflow_dispatch) - tag="${{ inputs.rc_tag }}" + tag="${RC_TAG}" ;; pull_request) tag="$(gh release list \