Merge pull request #181 from Dasharo/develop

workflows: add 'v' to DTS_VER Signed-off-by: Michał Iwanicki <[email protected]>
Dasharo · Oct 3, 2024 · 1c4c95e · 1c4c95e
2 parents f58330b + 50b3cde
commit 1c4c95e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -68,15 +68,15 @@ jobs:
         run: |
           # Extract tag version from GITHUB_REF
           TAG=${GITHUB_REF#refs/tags/}
-          DTS_VER=$(echo "${TAG}" | sed -E 's/^v//')
+          DTS_VER=${TAG}
           echo "DTS_VER=${DTS_VER}" >> $GITHUB_ENV
       - name: Validate DTS_VER
         if: ${{ success() }}
         shell: bash
         run: |
           # Retrieve DTS_VER from previous step
           DTS_VER_EXPECTED="${{ env.DTS_VER }}"
-          DTS_VER_ACTUAL=$(cat meta-dts/meta-dts-distro/conf/distro/dts-distro.conf | grep DISTRO_VERSION | tr -d "\" [A-Z]_=")
+          DTS_VER_ACTUAL="v$(cat meta-dts/meta-dts-distro/conf/distro/dts-distro.conf | grep DISTRO_VERSION | tr -d "\" [A-Z]_=")"
 
           if [ "${DTS_VER_EXPECTED}" != "${DTS_VER_ACTUAL}" ]; then
             echo "Tag (${DTS_VER_EXPECTED}) does not match version (${DTS_VER_ACTUAL}) in `meta-dts/meta-dts-distro/conf/distro/dts-distro.conf`"

diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -67,15 +67,15 @@ jobs:
         run: |
           # Extract tag version from GITHUB_REF
           TAG=${GITHUB_REF#refs/tags/}
-          DTS_VER=$(echo "${TAG}" | sed -E 's/^v//')
+          DTS_VER=${TAG}
           echo "DTS_VER=${DTS_VER}" >> $GITHUB_ENV
       - name: Validate DTS_VER
         if: ${{ success() }}
         shell: bash
         run: |
           # Retrieve DTS_VER from previous step
           DTS_VER_EXPECTED="${{ env.DTS_VER }}"
-          DTS_VER_ACTUAL=$(cat meta-dts/meta-dts-distro/conf/distro/dts-distro.conf | grep DISTRO_VERSION | tr -d "\" [A-Z]_=")
+          DTS_VER_ACTUAL="v$(cat meta-dts/meta-dts-distro/conf/distro/dts-distro.conf | grep DISTRO_VERSION | tr -d "\" [A-Z]_=")"
 
           if [ "${DTS_VER_EXPECTED}" != "${DTS_VER_ACTUAL}" ]; then
             echo "Tag (${DTS_VER_EXPECTED}) does not match version (${DTS_VER_ACTUAL}) in `meta-dts/meta-dts-distro/conf/distro/dts-distro.conf`"