Updated versioning

.github/workflows/buildAndPub.yml

@@ -30,7 +30,8 @@ jobs:
         with:
           compact: true
           input: node_versions.json
-          script: '[.[] | select(.version | test("v(1[8-9]|[2-9][0-9]).*"))] | map(.version) | .[0:200]'
+          #script: '[.[] | select(.version | test("v(1[8-9]|[2-9][0-9]).*"))] | map(.version) | .[0:200]'
+          script: '[.[] | select(.version | test("v(1[8-9]|[2-9][0-9]).*"))] | group_by(.version | match("v(\\d+).*").captures[0].string | tonumber) | map(max_by(.version | match("v(\\d+\\.\\d+).*").captures[0].string | split(".") as $parts | ($parts[0] | tonumber) * 1000 + ($parts[1] | tonumber))) | map({version: .version, major: (.version | match("v(\\d+).*").captures[0].string | tonumber)}) | .[0:200]'
 
       - uses: cloudposse/github-action-jq@main
         id: latest-version
@@ -84,8 +85,10 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           build-args: |
-            NODE_VERSION=${{ matrix.tag }}
+            NODE_VERSION=${{ matrix.tag.version }}
           context: .
           platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
           push: true
-          tags: betterweb/node:${{matrix.tag}}
+          tags: |
+            betterweb/node:${{matrix.tag.version}}
+            betterweb/node:v${{matrix.tag.major}}