mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-07-26 14:58:12 +00:00
fix(ci): fix double-v in version for v* style tags
setup-build-environment was using v${TAG#*-v} which prepended an extra
"v" when the tag already starts with "v" (e.g. v1.11 -> vv1.11).
Now uses the tag name directly for v* tags; strips name-v prefix only
for compound tags like room-server-v1.2.3.
Remove redundant Extract Version steps from the wio firmware workflow
since setup-build-environment already handles this.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -23,9 +23,12 @@ runs:
|
|||||||
|
|
||||||
# a git tag of "room-server-v1.2.3" should set "v1.2.3" as GIT_TAG_VERSION
|
# a git tag of "room-server-v1.2.3" should set "v1.2.3" as GIT_TAG_VERSION
|
||||||
# a git tag of "wio-tracker-v1.15-plus.1.3" should set "v1.15-plus.1.3" as GIT_TAG_VERSION
|
# a git tag of "wio-tracker-v1.15-plus.1.3" should set "v1.15-plus.1.3" as GIT_TAG_VERSION
|
||||||
# Strip the shortest prefix ending with "-v" so hyphens in the version are preserved.
|
# a git tag of "v1.11" should set "v1.11" as GIT_TAG_VERSION
|
||||||
- name: Extract Version from Git Tag
|
- name: Extract Version from Git Tag
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
GIT_TAG_NAME="${GITHUB_REF#refs/tags/}"
|
GIT_TAG_NAME="${GITHUB_REF#refs/tags/}"
|
||||||
echo "GIT_TAG_VERSION=v${GIT_TAG_NAME#*-v}" >> $GITHUB_ENV
|
case "$GIT_TAG_NAME" in
|
||||||
|
v*) echo "GIT_TAG_VERSION=${GIT_TAG_NAME}" >> $GITHUB_ENV ;;
|
||||||
|
*) echo "GIT_TAG_VERSION=v${GIT_TAG_NAME#*-v}" >> $GITHUB_ENV ;;
|
||||||
|
esac
|
||||||
|
|||||||
@@ -21,9 +21,6 @@ jobs:
|
|||||||
- name: Clone Repo
|
- name: Clone Repo
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Extract Version from Git Tag
|
|
||||||
run: echo "GIT_TAG_VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Setup Build Environment
|
- name: Setup Build Environment
|
||||||
uses: ./.github/actions/setup-build-environment
|
uses: ./.github/actions/setup-build-environment
|
||||||
|
|
||||||
@@ -45,9 +42,6 @@ jobs:
|
|||||||
- name: Clone Repo
|
- name: Clone Repo
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Extract Version from Git Tag
|
|
||||||
run: echo "GIT_TAG_VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Setup Build Environment
|
- name: Setup Build Environment
|
||||||
uses: ./.github/actions/setup-build-environment
|
uses: ./.github/actions/setup-build-environment
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user