diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml index 3016ec5..f6631be 100644 --- a/.github/workflows/blank.yml +++ b/.github/workflows/blank.yml @@ -7,11 +7,6 @@ on: # Triggers the workflow on push or pull request events but only for the "main" branch push: branches: [ "main" ] - pull_request: - branches: [ "main" ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/get-new-tag/action.yml b/get-new-tag/action.yml index 24947c6..0a305fe 100644 --- a/get-new-tag/action.yml +++ b/get-new-tag/action.yml @@ -41,7 +41,7 @@ runs: # get latest tag set -x +e # getting latest parent taggithub.event.number - eval "$( git describe --tags --long --first-parent ${GITHUB_SHA} | sed -r 's/^((v?([0-9]+))(\.([0-9]+)(\.([0-9]+)(.*))?)?)-([0-9]+)-[0-9a-h]+$/parent_tag=\1;parent_prefix=\2;parent_major=\3;parent_minor=\5;parent_patch=\7;parent_extra=\8;parent_tag_offset=\9;/')" + eval "$( git describe --tags --long --first-parent ${GITHUB_SHA} | sed -r 's/^((v?([0-9]+))(\.([0-9]+)(\.([0-9]+)(.*))?)?)-([0-9]+)-[0-9a-h]+$/parent_tag=\1;parent_prefix=\2;parent_major=\3;parent_minor=\5;parent_patch=\7;parent_extra=\8;parent_tag_offset=\9;/' )" echo "offset ${parent_tag_offset}" if [ $parent_tag_offset -eq 0 ] ; then # this commit already has tag