From 663730512f1ba6e5b0e8a4a4e53a2cdc53e87a1a Mon Sep 17 00:00:00 2001
From: Trevor Whitney <trevorjwhitney@gmail.com>
Date: Wed, 16 Oct 2024 16:57:09 -0600
Subject: [PATCH] ci: less fancy

---
 .github/workflows/logql-analyzer.yml | 34 ++++++++++------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/logql-analyzer.yml b/.github/workflows/logql-analyzer.yml
index 65f55d109ebd..fa1f40fa2900 100644
--- a/.github/workflows/logql-analyzer.yml
+++ b/.github/workflows/logql-analyzer.yml
@@ -30,29 +30,19 @@ jobs:
         MAJOR_MINOR_VERSION_REGEXP: '([0-9]+\\.[0-9]+)'
         RELEASE_TAG_REGEXP: '^([0-9]+\\.[0-9]+\\.[0-9]+)$'
       run: |
-        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")
-
-          echo "${release_name}"
-        }
-
         echo "$(./tools/image-tag)" > .tag
-
-        version="$(version)"
-        echo "release_version=${version}" >> "$GITHUB_OUTPUT"
-        echo "release_name=$(release_name ${version})" >> "$GITHUB_OUTPUT"
+        if [[ "$RELEASE_VERSION" == "test" ]]; then
+          echo "RELEASE_VERSION is not set, using image tag"
+          RELEASE_VERSION="$(cat .tag)"
+        fi
+        echo "RELEASE_VERSION: $RELEASE_VERSION"
+
+        # if the tag matches the pattern `D.D.D` then RELEASE_NAME="D-D-x", otherwise RELEASE_NAME="next"
+        RELEASE_NAME=$([[ $RELEASE_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_version=${RELEASE_VERSION}" >> "$GITHUB_OUTPUT"
+        echo "release_name=${RELEASE_NAME}" >> "$GITHUB_OUTPUT"
 
     - id: "get-github-app-token"
       name: "get github app token"