Fixes in release checks workflow

gavv · Sep 21, 2023 · 3d68cc2 · 3d68cc2
1 parent 0b2b5b4
commit 3d68cc2
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 40 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -105,7 +105,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
-
 
       - name: Build and test
         run: |
@@ -153,7 +152,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
-          fetch-tags: true
 
       - name: Build and test
         run: |
@@ -317,31 +315,3 @@ jobs:
         if: failure()
         run: |
           scripts/ci_checks/failure.sh
-
-  release-checks:
-    runs-on: ubuntu-latest
-
-    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - script: linux-checks/check-version
-
-    name: ${{ matrix.script }}
-    steps:
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-          fetch-tags: true
-
-      - name: Build and test
-        run: |
-          scripts/ci_checks/${{ matrix.script }}.sh
-
-      - name: Handle failure
-        if: failure()
-        run: |
-          scripts/ci_checks/failure.sh
diff --git a/.github/workflows/package.yml → .github/workflows/release.yml b/.github/workflows/package.yml → .github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: "create packages"
+name: "release"
 
 on:
   push:
@@ -8,14 +8,40 @@ on:
   workflow_dispatch:
 
 jobs:
+  checks:
+    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - script: linux-checks/check-version
+
+    name: ${{ matrix.script }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Run check
+        run: |
+          scripts/ci_checks/${{ matrix.script }}.sh
+
   package:
     if: startsWith(github.ref, 'refs/tags/v')
+    needs: [checks]
 
     runs-on: ubuntu-latest
+
     steps:
     - name: Checkout
       uses: actions/checkout@v3
       with:
+        submodules: recursive
         fetch-depth: 0
 
     - name: Version

diff --git a/scripts/ci_checks/linux-checks/check-version.sh b/scripts/ci_checks/linux-checks/check-version.sh
@@ -2,21 +2,19 @@
 
 set -euo pipefail
 
-
 tagname="$(git tag -l | tail -n1)"
 
 header_tagname="v$(python3 scripts/scons_helpers/parse-version.py)"
 
 if [[ "$tagname" != "$header_tagname" ]]; then
-  echo >&2 
-  echo >&2"version check FAILED"
-  echo >&2"the git tag name and version declared in version.h is not the same"
-  echo >&2"${tagname} git version tag"
-  echo >&2"${header_tagname} header version tag"
-  echo >&2
+  echo
+  echo "version check FAILED"
+  echo "the git tag name and version declared in version.h is not the same"
+  echo "${tagname} git version tag"
+  echo "${header_tagname} header version tag"
+  echo
   exit 1
 fi
 
 echo "version check SUCCEEDED"
-echo 
-
+echo