Add install-as-version input

Fixes #34
oracle-actions · Aug 5, 2022 · c59dba7 · c59dba7
1 parent dfd0df3
commit c59dba7
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 .idea/
 classes/
+
+*.iml
diff --git a/action.yml b/action.yml
@@ -19,9 +19,14 @@ inputs:
     required: true
     default: 'latest'
   install:
-    description: 'Install the downloaded JDK archive file by running actions/setup-java, default to `true`'
+    description: 'Install the downloaded JDK archive file by running actions/setup-java, defaults to `true`'
     required: true
     default: 'true'
+  install-as-version:
+    description:
+      Controls which value is passed as `java-version` to actions/setup-java, defaults to `PARSE_URI`
+      if `release` starts with a digit, else it defaults to `HASH_URI`
+    required: false
   uri:
     description: 'URI of JDK archive file to download'
     required: false
@@ -44,9 +49,17 @@ runs:
         JAVA=$JAVA_HOME_17_X64/bin/java
         DOWNLOAD=$GITHUB_ACTION_PATH/src/Download.java
         if [ ! -z "${{ inputs.uri }}" ]; then
-          $JAVA $DOWNLOAD ${{ inputs.uri }}
+          $JAVA \
+            -Dinstall-as-version="${{ inputs.install-as-version }}" \
+            $DOWNLOAD \
+            ${{ inputs.uri }}
         else
-          $JAVA $DOWNLOAD ${{ inputs.website }} ${{ inputs.release }} ${{ inputs.version }}
+          $JAVA \
+            -Dinstall-as-version="${{ inputs.install-as-version }}" \
+            $DOWNLOAD \
+            ${{ inputs.website }} \
+            ${{ inputs.release }} \
+            ${{ inputs.version }}
         fi
     - name: 'Install Java Development Kit'
       if: ${{ inputs.install  == 'true' }}

diff --git a/src/Download.java b/src/Download.java
@@ -98,7 +98,8 @@ static void main(boolean dryRun, String... args) {
 
       // Set outputs
       outputs.put("archive", archive.toString());
-      outputs.put("version", website.parseVersion(uri).orElse("UNKNOWN-VERSION"));
+      var digit = Character.isDigit(jdk.version().charAt(0));
+      outputs.put("version", website.computeVersionString(uri, digit ? "PARSE_URI" : "HASH_URI"));
     } catch (Exception exception) {
       exception.printStackTrace(System.err);
       GitHub.error("Error detected: " + exception);
@@ -289,6 +290,17 @@ default Path computeArchivePath(String uri) {
       return cache.resolve(file);
     }
 
+    default String computeVersionString(String uri, String defaultVersion) {
+      var property = System.getProperty("install-as-version");
+      GitHub.debug("install-as-version: " + property);
+      var version = property == null || property.isBlank() ? defaultVersion : property;
+      return switch (version) {
+        case "PARSE_URI" -> parseVersion(uri).orElse("UNKNOWN-VERSION");
+        case "HASH_URI" -> Integer.toString(uri.hashCode());
+        default -> version;
+      };
+    }
+
     /** Try to parse version information from the given uri. */
     default Optional<String> parseVersion(String uri) {
       for (var versionPattern : parseVersionPatterns()) {