fix: stricter version parsing

.github/workflows/test-e2e.yml

@@ -9,13 +9,14 @@ on:
 
 jobs:
   gh-action-default:
-    name: Action validates dockerfiles
+    name: Action validates Dockerfiles
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: ./
         with:
           dockerfile: test/fixtures/Dockerfile-valid
+
   gh-action-version:
     name: Action supports custom version
     runs-on: ubuntu-22.04
@@ -25,11 +26,14 @@ jobs:
         id: check
         with:
           dockerfile: test/fixtures/Dockerfile-valid
-          version: 2.9.0
-      - name: check hadolint version
+          version: 2.10.0
+      - name: Compare versions
+        env:
+          HADOLINT_VERSION: ${{ steps.check.outputs.hadolint_version }}
+          REQUESTED_VERSION: 2.10.0
         run: |
-          if [[ ! "${{ steps.check.outputs.hadolint_version }}" == "2.9.0-no-git" ]]; then
-            echo "::error::Version mismatch: \"${{ steps.check.outputs.hadolint_version }}\" does not equal \"2.9.0-no-git\""
+          if [[ "${HADOLINT_VERSION}" != "${REQUESTED_VERSION}" ]]; then
+            echo "::error::Version mismatch: \"${HADOLINT_VERSION}\" does not equal \"${REQUESTED_VERSION}\""
             exit 1
           fi
 
@@ -42,6 +46,7 @@ jobs:
         with:
           dockerfile: "test/**/Dockerfile-glob-*"
           annotate: false
+
   # https://github.com/jbergstroem/hadolint-gh-action/issues/134
   gh-action-multiple-invocations:
     name: Action supports multiple invocations in a job
@@ -52,18 +57,47 @@ jobs:
       - uses: ./
         with:
           dockerfile: test/fixtures/Dockerfile-valid
+          annotate: false
       # Download and run custom version
       - uses: ./
         with:
           dockerfile: test/fixtures/Dockerfile-valid
           version: 2.11.0
-      # Redownload if binary is broken
+          annotate: false
+      # Redownload if binary is broken, in this case a non-executable
       - run: chmod -x /usr/local/bin/hadolint
       - uses: ./
         with:
           dockerfile: test/fixtures/Dockerfile-valid
           version: 2.11.0
+          annotate: false
       # Download and run default version again
       - uses: ./
         with:
           dockerfile: test/fixtures/Dockerfile-valid
+          annotate: false
+
+  # https://github.com/jbergstroem/hadolint-gh-action/issues/142
+  gh-action-version-variations:
+    name: Action supports version variations
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        version: ["1.23.0", "2.9.0", "2.12.0"]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./
+        id: check
+        with:
+          dockerfile: test/fixtures/Dockerfile-valid
+          annotate: false
+          version: ${{ matrix.version }}
+      - name: Compare versions
+        env:
+          HADOLINT_VERSION: ${{ steps.check.outputs.hadolint_version }}
+          REQUESTED_VERSION: ${{ matrix.version }}
+        run: |
+          if [[ "${HADOLINT_VERSION}" != "${REQUESTED_VERSION}" ]]; then
+            echo "::error::Version mismatch: \"${HADOLINT_VERSION}\" does not equal \"${REQUESTED_VERSION}\""
+            exit 1
+          fi

install.sh

@@ -6,14 +6,15 @@ shopt -s nullglob globstar
 
 CI=${GITHUB_ACTIONS:-}
 VERSION=${version:-}
+EXTRACT_VERSION_CMD="hadolint --version | sed 's/-no-git//' | cut -d ' ' -f 4"
 
 [[ -z ${CI} ]] && echo "Will only run in Github Actions" && exit 1
 
 DOWNLOAD="false"
 # Check if hadolint is installed and compare versions to decide
 # if we should download a new version
 if [ -x "$(command -v hadolint)" ]; then
-  INSTALLED_VERSION=$(hadolint --version | cut -d " " -f 4 2>&1)
+  INSTALLED_VERSION=$(eval "${EXTRACT_VERSION_CMD}" 2>&1)
   echo "::debug::Found existing Hadolint version: ${INSTALLED_VERSION}"
   if [ "${INSTALLED_VERSION}" != "${VERSION}" ]; then
     echo "::info::Hadolint version (${INSTALLED_VERSION}) does not match requested version (${VERSION})"
@@ -35,5 +36,5 @@ if [ "${DOWNLOAD}" == "true" ]; then
   chmod +x /usr/local/bin/hadolint
 fi
 
-new_version=$(hadolint --version | cut -d ' ' -f 4 2>&1)
+new_version=$(eval "${EXTRACT_VERSION_CMD}" 2>&1)
 echo "::debug::Hadolint ${new_version} installed successfully"

lib/hadolint.sh

@@ -5,7 +5,7 @@ HADOLINT_GH_ACTION_VERSION="1.12.0"
 
 function output_hadolint_version() {
   local OUTPUT=""
-  OUTPUT=$(eval "${HADOLINT_PATH}" --version | cut -d " " -f 4)
+  OUTPUT=$(eval "${HADOLINT_PATH}" --version | sed 's/-no-git//' | cut -d " " -f 4)
   echo "hadolint_gh_action_version=${HADOLINT_GH_ACTION_VERSION}"
   echo "hadolint_version=${OUTPUT}"
 }