From 62cc3c4ef8a3e2b6cbe8951f3227aaf747be6505 Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Wed, 12 Apr 2023 10:29:01 +0200 Subject: [PATCH] ci: prevent accidental GOOS and GOARCH confusion in host go toolchain --- .github/actions/build_cdbg/action.yml | 6 +++--- .github/actions/build_cli/action.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/build_cdbg/action.yml b/.github/actions/build_cdbg/action.yml index 385d31715e..86d2358d06 100644 --- a/.github/actions/build_cdbg/action.yml +++ b/.github/actions/build_cdbg/action.yml @@ -21,13 +21,13 @@ runs: - name: Build cdbg shell: bash env: - GOOS: ${{ inputs.targetOS }} - GOARCH: ${{ inputs.targetArch }} + TARGET_GOOS: ${{ inputs.targetOS }} + TARGET_GOARCH: ${{ inputs.targetArch }} OUTPUT_PATH: ${{ inputs.outputPath }} run: | echo "::group::Build cdbg" mkdir -p "$(dirname "${OUTPUT_PATH}")" - label="//debugd/cmd/cdbg:cdbg_${GOOS}_${GOARCH}" + label="//debugd/cmd/cdbg:cdbg_${TARGET_GOOS}_${TARGET_GOARCH}" bazel build "${label}" repository_root=$(git rev-parse --show-toplevel) out_rel=$(bazel cquery --output=files "${label}") diff --git a/.github/actions/build_cli/action.yml b/.github/actions/build_cli/action.yml index 26c1610e67..eacb5965c9 100644 --- a/.github/actions/build_cli/action.yml +++ b/.github/actions/build_cli/action.yml @@ -43,8 +43,8 @@ runs: - name: Build CLI shell: bash env: - GOOS: ${{ inputs.targetOS }} - GOARCH: ${{ inputs.targetArch }} + TARGET_GOOS: ${{ inputs.targetOS }} + TARGET_GOARCH: ${{ inputs.targetArch }} OUTPUT_PATH: ${{ inputs.outputPath || format('./build/constellation-{0}-{1}', inputs.targetOS, inputs.targetArch) }} run: | echo "::group::Build CLI" @@ -55,7 +55,7 @@ runs: else cli_variant=oss fi - label="//cli:cli_${cli_variant}_${GOOS}_${GOARCH}" + label="//cli:cli_${cli_variant}_${TARGET_GOOS}_${TARGET_GOARCH}" bazel build "${label}" repository_root=$(git rev-parse --show-toplevel) out_rel=$(bazel cquery --output=files "${label}")