Skip to content

Commit

Permalink
Merge pull request #29 from secondlife/build-id
Browse files Browse the repository at this point in the history
Unconditionally use the GitHub workflow run ID as build ID.
  • Loading branch information
nat-goodspeed authored Jan 2, 2024
2 parents 3905538 + dec4e9b commit f20722d
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ runs:
env:
AUTOBUILD: autobuild # Expected by some 3p build scripts
AUTOBUILD_ADDRSIZE: ${{ inputs.addrsize }}
AUTOBUILD_BUILD_ID: ${{ github.run_id }}
AUTOBUILD_CONFIG_FILE: ${{ inputs.file }}
AUTOBUILD_GITHUB_TOKEN: ${{ inputs.token }}
AUTOBUILD_INSTALLABLE_CACHE: ${{ github.workspace }}/.autobuild-installables
Expand All @@ -196,17 +197,6 @@ runs:
use_scm_version="$(autobuild print --json | jq -j .package_description.use_scm_version)"
use_scm_version="$(echo $use_scm_version | tr '[:upper:]' '[:lower:]')"
# Set AUTOBUILD_BUILD_ID
if [[ "$BUILD_ID" == "SHA" ]]; then
# Only default build ID to SHA if SCM version is disabled
if [[ "$use_scm_version" != "true" ]]; then
export AUTOBUILD_BUILD_ID="$SHORT_SHA"
fi
elif [[ ! -z "$BUILD_ID" ]]; then
# Allow an explicitly set build ID to be used
export AUTOBUILD_BUILD_ID="$BUILD_ID"
fi
if [[ ! -z "$CONFIGURATION" ]]; then
export AUTOBUILD_CONFIGURATION="$CONFIGURATION"
fi
Expand Down

0 comments on commit f20722d

Please sign in to comment.