From 6e91e5b82bb513082bfcb06edc5f703507a693a9 Mon Sep 17 00:00:00 2001 From: git-phu Date: Tue, 8 Nov 2022 16:06:02 -0800 Subject: [PATCH] use longer short shas it seems github APIs want us to use longer shas in some cases where a 7 character short sha is still entirely valid So just set the minimum short sha length to 10 --- .github/actions/build-branch/action.yml | 2 +- .github/workflows/publish-oss-for-cloud.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-branch/action.yml b/.github/actions/build-branch/action.yml index e1df48d97e2d9..740595ef8f466 100644 --- a/.github/actions/build-branch/action.yml +++ b/.github/actions/build-branch/action.yml @@ -18,7 +18,7 @@ runs: # if the *branch_version_tag* input param is not specified, then generate it as 'dev-` # [[ "${{ inputs.branch_version_tag }}" != '' ]] && echo "branch_version_tag=${{ inputs.branch_version_tag }}" >> $GITHUB_OUTPUT \ - || { short_hash=$(git rev-parse --short=7 HEAD); echo "branch_version_tag=dev-$short_hash" >> $GITHUB_OUTPUT ; } + || { short_hash=$(git rev-parse --short=10 HEAD); echo "branch_version_tag=dev-$short_hash" >> $GITHUB_OUTPUT ; } - uses: actions/setup-java@v1 with: diff --git a/.github/workflows/publish-oss-for-cloud.yml b/.github/workflows/publish-oss-for-cloud.yml index f3a5937f15770..fd6e205875ecd 100644 --- a/.github/workflows/publish-oss-for-cloud.yml +++ b/.github/workflows/publish-oss-for-cloud.yml @@ -62,7 +62,7 @@ jobs: run: |- set -x - commit_sha=$(git rev-parse --short=7 HEAD) + commit_sha=$(git rev-parse --short=10 HEAD) # set dev_tag # AirbyteVersion.java allows versions that have a prefix of 'dev'