Skip to content

Commit 5383244

Browse files
committed
Debug logs
1 parent 87e19ec commit 5383244

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ jobs:
7474
if: runner.os == 'Linux' && github.repository_owner == 'Open-CMSIS-Pack'
7575
run: |
7676
DESCRIBE=$(git describe --tags --long --match 'v[0-9]*.[0-9]*.[0-9]*' 2>/dev/null || true)
77+
echo "DESCRIBE: ${DESCRIBE}"
7778
if [ -z "${DESCRIBE}" ]; then
7879
echo "No semver tag matching vX.Y.Z found."
7980
exit 1
@@ -91,16 +92,18 @@ jobs:
9192
;;
9293
pull_request)
9394
npm version -s --allow-same-version --no-git-tag-version --new-version "${BASE_TAG#v}"
94-
npm version --no-git-tag-version --prepatch --preid "pr${{ github.event.number }}${PR_QUALIFIER}"
95+
PRERELEASE_VERSION="${BASE_TAG#v}-pr${{ github.event.number }}${PR_QUALIFIER}"
96+
npm version --no-git-tag-version --new-version "${PRERELEASE_VERSION}" && echo "Prerelease version set succeeded" || echo "Prerelease version set FAILED with exit code $?"
9597
;;
9698
*)
9799
npm version -s --allow-same-version --no-git-tag-version --new-version "${BASE_TAG#v}"
98-
npm version --no-git-tag-version --prepatch --preid "${SAFE_REF_NAME}${BRANCH_QUALIFIER}"
100+
PRERELEASE_VERSION="${BASE_TAG#v}-${SAFE_REF_NAME}${BRANCH_QUALIFIER}"
101+
npm version --no-git-tag-version --new-version "${PRERELEASE_VERSION}" && echo "Prerelease version set succeeded" || echo "Prerelease version set FAILED with exit code $?"
99102
;;
100103
esac
101104
VERSION="$(jq -r ".version" < package.json)"
102105
sed -i "s/## Unreleased/## ${VERSION}/" CHANGELOG.md
103-
echo "Version is ${VERSION}"
106+
echo "Updated CHANGELOG with version ${VERSION}"
104107
105108
- name: Remove badges
106109
if: runner.os == 'Linux'

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
DESCRIBE=$(git describe --tags | grep -Eo 'v[0-9]+\.[0-9]+\.[0-9]+')
5757
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')
59-
npm version -s --no-git-tag-version --new-version "${DESCRIBE#v}"
60-
npm version -s --no-git-tag-version --prepatch --preid "${BRANCH}${QUALIFIER:+-${QUALIFIER}}"
59+
npm version -s --allow-same-version --no-git-tag-version --new-version "${DESCRIBE#v}"
60+
npm version -s --no-git-tag-version --new-version "${BRANCH}${QUALIFIER:+-${QUALIFIER}}"
6161
VERSION="$(jq -r ".version" < package.json)"
6262
sed -i "s/## Unreleased/## ${VERSION}/" CHANGELOG.md
6363
echo "Version is ${VERSION}"

0 commit comments

Comments
 (0)