Skip to content

Commit 0aaa646

Browse files
authored
Merge branch 'main' into badge-url
2 parents 134eb3b + 7a82a44 commit 0aaa646

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ jobs:
8080
;;
8181
pull_request)
8282
DESCRIBE=$(git describe --tags | grep -Eo 'v[0-9]+\.[0-9]+\.[0-9]+')
83-
QUALIFIER=$(git describe --tags | grep -Eo '\-g[0-9a-f]+$')
83+
QUALIFIER=$(git describe --tags | grep -Eo '\-g[0-9a-f]+$' || true)
8484
yarn version -s --no-git-tag-version --new-version "${DESCRIBE#v}"
8585
yarn version --no-git-tag-version --prepatch --preid "pr${{ github.event.number }}${QUALIFIER}"
8686
;;
8787
*)
8888
DESCRIBE=$(git describe --tags | grep -Eo 'v[0-9]+\.[0-9]+\.[0-9]+')
89-
QUALIFIER=$(git describe --tags | grep -Eo '[0-9]+\-g[0-9a-f]+$')
89+
QUALIFIER=$(git describe --tags | grep -Eo '[0-9]+\-g[0-9a-f]+$' || true)
9090
yarn version -s --no-git-tag-version --new-version "${DESCRIBE#v}"
9191
yarn version --no-git-tag-version --prepatch --preid "${{ github.ref_name }}${QUALIFIER}"
9292
;;

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
if: runner.os == 'Linux' && github.repository_owner == 'Open-CMSIS-Pack'
5555
run: |
5656
DESCRIBE=$(git describe --tags | grep -Eo 'v[0-9]+\.[0-9]+\.[0-9]+')
57-
QUALIFIER=$(git describe --tags | grep -Eo '[0-9]+\-g[0-9a-f]+$')
57+
QUALIFIER=$(git describe --tags | grep -Eo '[0-9]+\-g[0-9a-f]+$' || true)
5858
BRANCH=$(echo "${{ github.ref_name }}" | sed 's/[^0-9A-Za-z-]/-/g')
5959
yarn version -s --no-git-tag-version --new-version "${DESCRIBE#v}"
6060
yarn version -s --no-git-tag-version --prepatch --preid "${BRANCH}${QUALIFIER:+-${QUALIFIER}}"

0 commit comments

Comments
 (0)