From 368c98ac79692c18e98bff33e4b9565118d1a222 Mon Sep 17 00:00:00 2001
From: Aparna Jyothi <aparnajyothi-y@github.com>
Date: Mon, 28 Apr 2025 19:44:20 +0530
Subject: [PATCH] regex update

---
 .github/workflows/publish-immutable-actions.yml | 4 ++--
 dist/cleanup/index.js                           | 2 +-
 dist/setup/index.js                             | 2 +-
 src/util.ts                                     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-immutable-actions.yml b/.github/workflows/publish-immutable-actions.yml
index 87c02072..a3e70337 100644
--- a/.github/workflows/publish-immutable-actions.yml
+++ b/.github/workflows/publish-immutable-actions.yml
@@ -2,7 +2,7 @@ name: 'Publish Immutable Action Version'
 
 on:
   release:
-    types: [published]
+    types: [released]
 
 jobs:
   publish:
@@ -17,4 +17,4 @@ jobs:
         uses: actions/checkout@v4
       - name: Publish
         id: publish
-        uses: actions/publish-immutable-action@0.0.3
+        uses: actions/publish-immutable-action@0.0.4
diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
index 9571e1a9..24014651 100644
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -97075,7 +97075,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     const versionFileName = getFileName(versionFile);
     if (versionFileName == '.tool-versions') {
         javaVersionRegExp =
-            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\S+)?(\.\d+)?(-ea(\.\d+)?)?(\.LTS)?)$/m;
+            /^java\s+(?<distribution>[a-zA-Z0-9.-]+)-(?<version>[a-zA-Z0-9._+\-]+(?:[-][a-zA-Z0-9._+\-]*)*)$/m;
     }
     else {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
diff --git a/dist/setup/index.js b/dist/setup/index.js
index f69c4d44..de8b5b0b 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -135080,7 +135080,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     const versionFileName = getFileName(versionFile);
     if (versionFileName == '.tool-versions') {
         javaVersionRegExp =
-            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\S+)?(\.\d+)?(-ea(\.\d+)?)?(\.LTS)?)$/m;
+            /^java\s+(?<distribution>[a-zA-Z0-9.-]+)-(?<version>[a-zA-Z0-9._+\-]+(?:[-][a-zA-Z0-9._+\-]*)*)$/m;
     }
     else {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
diff --git a/src/util.ts b/src/util.ts
index ed7cf61a..8057e980 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -133,7 +133,7 @@ export function getVersionFromFileContent(
   const versionFileName = getFileName(versionFile);
   if (versionFileName == '.tool-versions') {
     javaVersionRegExp =
-      /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\S+)?(\.\d+)?(-ea(\.\d+)?)?(\.LTS)?)$/m;
+      /^java\s+(?<distribution>[a-zA-Z0-9.-]+)-(?<version>[a-zA-Z0-9._+\-]+(?:[-][a-zA-Z0-9._+\-]*)*)$/m;
   } else {
     javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
   }