diff --git a/.github/workflows/appimage10.yml b/.github/workflows/appimage10.yml index 1f065c28..03f2dfe1 100644 --- a/.github/workflows/appimage10.yml +++ b/.github/workflows/appimage10.yml @@ -75,19 +75,16 @@ jobs: set +e git fetch --tags --prune --no-recurse-submodules --depth=149 origin +$GITHUB_SHA # fetch-tags: true # is broken echo git_fetch_exitstatus=$? - git_show_ref=$(git show-ref --hash $GITHUB_REF) + git_show_ref=$(git show-ref --hash $GITHUB_REF) # get tagcommit hash git_show_ref_exitstatus=$? - set -e echo git_show_ref_exitstatus=$git_show_ref_exitstatus - if [ $git_show_ref_exitstatus -ne 0 ] # should never occur - then - git update-ref $GITHUB_REF $GITHUB_SHA # put it back - echo git_update_ref=$? - git_show_ref=$(git show-ref --hash $GITHUB_REF) # retry - echo git_show_ref_exitstatus=$? - fi echo git_show_ref=$git_show_ref - test "$git_show_ref" = "$GITHUB_SHA" # check we got the ref back (or fail CI) + git_rev_list=$(git rev-list -n1 $GITHUB_REF) # get commit hash + git_rev_list_exitstatus=$? + echo git_rev_list_exitstatus=$git_rev_list_exitstatus + echo git_rev_list=$git_rev_list + set -e + test "$git_show_ref" = "$GITHUB_SHA" || test "$git_rev_list" = "$GITHUB_SHA" # check we got the ref back (or fail CI) git_describe=$(git describe --tags $GITHUB_SHA | sed -e 's#\-\([0-9]\+\-g\)#\+\1#') # /-\d+-g/ echo git_describe=$git_describe diff --git a/.github/workflows/appimage7.yml b/.github/workflows/appimage7.yml index b0dd671e..ad78d40b 100644 --- a/.github/workflows/appimage7.yml +++ b/.github/workflows/appimage7.yml @@ -75,19 +75,16 @@ jobs: set +e git fetch --tags --prune --no-recurse-submodules --depth=149 origin +$GITHUB_SHA # fetch-tags: true # is broken echo git_fetch_exitstatus=$? - git_show_ref=$(git show-ref --hash $GITHUB_REF) + git_show_ref=$(git show-ref --hash $GITHUB_REF) # get tagcommit hash git_show_ref_exitstatus=$? - set -e echo git_show_ref_exitstatus=$git_show_ref_exitstatus - if [ $git_show_ref_exitstatus -ne 0 ] # should never occur - then - git update-ref $GITHUB_REF $GITHUB_SHA # put it back - echo git_update_ref=$? - git_show_ref=$(git show-ref --hash $GITHUB_REF) # retry - echo git_show_ref_exitstatus=$? - fi echo git_show_ref=$git_show_ref - test "$git_show_ref" = "$GITHUB_SHA" # check we got the ref back (or fail CI) + git_rev_list=$(git rev-list -n1 $GITHUB_REF) # get commit hash + git_rev_list_exitstatus=$? + echo git_rev_list_exitstatus=$git_rev_list_exitstatus + echo git_rev_list=$git_rev_list + set -e + test "$git_show_ref" = "$GITHUB_SHA" || test "$git_rev_list" = "$GITHUB_SHA" # check we got the ref back (or fail CI) git_describe=$(git describe --tags $GITHUB_SHA | sed -e 's#\-\([0-9]\+\-g\)#\+\1#') # /-\d+-g/ echo git_describe=$git_describe diff --git a/.github/workflows/appimage8.yml b/.github/workflows/appimage8.yml index 8d3f93a0..0f6cc3fe 100644 --- a/.github/workflows/appimage8.yml +++ b/.github/workflows/appimage8.yml @@ -75,19 +75,16 @@ jobs: set +e git fetch --tags --prune --no-recurse-submodules --depth=149 origin +$GITHUB_SHA # fetch-tags: true # is broken echo git_fetch_exitstatus=$? - git_show_ref=$(git show-ref --hash $GITHUB_REF) + git_show_ref=$(git show-ref --hash $GITHUB_REF) # get tagcommit hash git_show_ref_exitstatus=$? - set -e echo git_show_ref_exitstatus=$git_show_ref_exitstatus - if [ $git_show_ref_exitstatus -ne 0 ] # should never occur - then - git update-ref $GITHUB_REF $GITHUB_SHA # put it back - echo git_update_ref=$? - git_show_ref=$(git show-ref --hash $GITHUB_REF) # retry - echo git_show_ref_exitstatus=$? - fi echo git_show_ref=$git_show_ref - test "$git_show_ref" = "$GITHUB_SHA" # check we got the ref back (or fail CI) + git_rev_list=$(git rev-list -n1 $GITHUB_REF) # get commit hash + git_rev_list_exitstatus=$? + echo git_rev_list_exitstatus=$git_rev_list_exitstatus + echo git_rev_list=$git_rev_list + set -e + test "$git_show_ref" = "$GITHUB_SHA" || test "$git_rev_list" = "$GITHUB_SHA" # check we got the ref back (or fail CI) git_describe=$(git describe --tags $GITHUB_SHA | sed -e 's#\-\([0-9]\+\-g\)#\+\1#') # /-\d+-g/ echo git_describe=$git_describe diff --git a/.github/workflows/appimage9.yml b/.github/workflows/appimage9.yml index 44051b2d..23e1b1f4 100644 --- a/.github/workflows/appimage9.yml +++ b/.github/workflows/appimage9.yml @@ -75,19 +75,16 @@ jobs: set +e git fetch --tags --prune --no-recurse-submodules --depth=149 origin +$GITHUB_SHA # fetch-tags: true # is broken echo git_fetch_exitstatus=$? - git_show_ref=$(git show-ref --hash $GITHUB_REF) + git_show_ref=$(git show-ref --hash $GITHUB_REF) # get tagcommit hash git_show_ref_exitstatus=$? - set -e echo git_show_ref_exitstatus=$git_show_ref_exitstatus - if [ $git_show_ref_exitstatus -ne 0 ] # should never occur - then - git update-ref $GITHUB_REF $GITHUB_SHA # put it back - echo git_update_ref=$? - git_show_ref=$(git show-ref --hash $GITHUB_REF) # retry - echo git_show_ref_exitstatus=$? - fi echo git_show_ref=$git_show_ref - test "$git_show_ref" = "$GITHUB_SHA" # check we got the ref back (or fail CI) + git_rev_list=$(git rev-list -n1 $GITHUB_REF) # get commit hash + git_rev_list_exitstatus=$? + echo git_rev_list_exitstatus=$git_rev_list_exitstatus + echo git_rev_list=$git_rev_list + set -e + test "$git_show_ref" = "$GITHUB_SHA" || test "$git_rev_list" = "$GITHUB_SHA" # check we got the ref back (or fail CI) git_describe=$(git describe --tags $GITHUB_SHA | sed -e 's#\-\([0-9]\+\-g\)#\+\1#') # /-\d+-g/ echo git_describe=$git_describe