ci: cleanup prepare script

grafana · Oct 16, 2024 · 8a0f312 · 8a0f312
1 parent 7a9e12c
commit 8a0f312
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/.github/workflows/logql-analyzer.yml b/.github/workflows/logql-analyzer.yml
@@ -30,20 +30,29 @@ jobs:
         MAJOR_MINOR_VERSION_REGEXP: '([0-9]+\\.[0-9]+)'
         RELEASE_TAG_REGEXP: '^([0-9]+\\.[0-9]+\\.[0-9]+)$'
       run: |
-        echo "$(./tools/image-tag)" > .tag
-        version="${RELEASE_VERSION}"
-        if [[ "${version}" == "test" ]]; then
-          echo "RELEASE_VERSION is not set, using image tag"
-          version=$(cat .tag)
-        fi
-        echo "RELEASE_VERSION: $version"
+        version() {
+          local version="${RELEASE_VERSION}"
+          if [[ "${version}" == "test" ]]; then
+            echo "RELEASE_VERSION is not set, using image tag"
+            version=$(cat .tag)
+          fi
+          echo "${version}"
+        }
+
+        release_name() {
+          local version=$1
+          # if the tag matches the pattern `D.D.D` then RELEASE_NAME="D-D-x", otherwise RELEASE_NAME="next"
+          local release_name
+          release_name=$([[ ${version} =~ $RELEASE_TAG_REGEXP ]] && echo $RELEASE_TAG | grep -oE $MAJOR_MINOR_VERSION_REGEXP | sed "s/\\./-/g" | sed "s/$/-x/" || echo "next")
 
-        # if the tag matches the pattern `D.D.D` then RELEASE_NAME="D-D-x", otherwise RELEASE_NAME="next"
-        RELEASE_NAME=$([[ $version =~ $RELEASE_TAG_REGEXP ]] && echo $RELEASE_TAG | grep -oE $MAJOR_MINOR_VERSION_REGEXP | sed "s/\\./-/g" | sed "s/$/-x/" || echo "next")
-        echo "RELEASE_NAME: $RELEASE_NAME"
+          echo "${release_name}"
+        }
+
+        echo "$(./tools/image-tag)" > .tag
 
+        version="$(version)"
         echo "release_version=${version}" >> "$GITHUB_OUTPUT"
-        echo "release_name=${RELEASE_NAME}" >> "$GITHUB_OUTPUT"
+        echo "release_name=$(release_name ${version})" >> "$GITHUB_OUTPUT"
 
     - id: "get-github-app-token"
       name: "get github app token"