Merge 82fce8d395 into 9eda6b51cc

On self-hosted runners toolchains.xml may survive multiple runs and unexpectedly
grow as a result of the toolchains setup simply appending the JDK definition
even if one with the same `type` and `provides.id` already exists.

Restructuring the parsing step and filtering the potentially existing list of
toolchain definitions prevents this and also fixes toolchain.xml files that
already contain duplicates.

Fixes #530

.github/workflows/basic-validation.yml

@@ -15,5 +15,3 @@ jobs:
   call-basic-validation:
     name: Basic validation
     uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main
-    with:
-      node-version: '20.x'

.github/workflows/check-dist.yml

@@ -15,5 +15,3 @@ jobs:
   call-check-dist:
     name: Check dist/
     uses: actions/reusable-workflows/.github/workflows/check-dist.yml@main
-    with:
-      node-version: '20.x'

action.yml

@@ -81,6 +81,6 @@ outputs:
   cache-hit:
     description: 'A boolean value to indicate an exact match was found for the primary key'
 runs:
-  using: 'node20'
+  using: 'node16'
   main: 'dist/setup/index.js'
   post: 'dist/cleanup/index.js'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-java",
-  "version": "4.0.0",
+  "version": "3.4.1",
   "private": true,
   "description": "setup java action",
   "main": "dist/setup/index.js",
@@ -29,33 +29,28 @@
     "@actions/cache": "^3.0.4",
     "@actions/core": "^1.10.0",
     "@actions/exec": "^1.0.4",
-    "@actions/glob": "^0.4.0",
-    "@actions/http-client": "^2.2.0",
+    "@actions/glob": "^0.2.0",
+    "@actions/http-client": "^1.0.11",
     "@actions/io": "^1.0.2",
-    "@actions/tool-cache": "^2.0.1",
+    "@actions/tool-cache": "^1.6.1",
     "semver": "^7.3.4",
     "xmlbuilder2": "^2.4.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.9",
-    "@types/node": "^20.9.3",
+    "@types/jest": "^27.0.2",
+    "@types/node": "^16.11.25",
     "@types/semver": "^7.3.4",
     "@typescript-eslint/eslint-plugin": "^5.54.0",
     "@typescript-eslint/parser": "^5.54.0",
-    "@vercel/ncc": "^0.38.1",
+    "@vercel/ncc": "^0.33.4",
     "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-node": "^11.1.0",
-    "jest": "^29.7.0",
-    "jest-circus": "^29.7.0",
+    "jest": "^27.5.1",
+    "jest-circus": "^27.5.1",
     "prettier": "^2.8.4",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.3.2"
-  },
-  "bugs": {
-    "url": "https://github.com/actions/setup-java/issues"
-  },
-  "homepage": "https://github.com/actions/setup-java#readme"
-  
+    "ts-jest": "^27.0.5",
+    "typescript": "^4.2.3"
+  }
 }

src/cache.ts

@@ -149,12 +149,10 @@ export async function save(id: string) {
     await cache.saveCache(packageManager.path, primaryKey);
     core.info(`Cache saved with the key: ${primaryKey}`);
   } catch (error) {
-    const err = error as Error;
-
-    if (err.name === cache.ReserveCacheError.name) {
-      core.info(err.message);
+    if (error.name === cache.ReserveCacheError.name) {
+      core.info(error.message);
     } else {
-      if (isProbablyGradleDaemonProblem(packageManager, err)) {
+      if (isProbablyGradleDaemonProblem(packageManager, error)) {
         core.warning(
           'Failed to save Gradle cache on Windows. If tar.exe reported "Permission denied", try to run Gradle with `--no-daemon` option. Refer to https://github.com/actions/cache/issues/454 for details.'
         );

src/cleanup-java.ts

@@ -13,9 +13,7 @@ async function removePrivateKeyFromKeychain() {
       );
       await gpg.deleteKey(keyFingerprint);
     } catch (error) {
-      core.setFailed(
-        `Failed to remove private key due to: ${(error as Error).message}`
-      );
+      core.setFailed(`Failed to remove private key due to: ${error.message}`);
     }
   }
 }

src/distributions/dragonwell/installer.ts

@@ -206,9 +206,7 @@ export class DragonwellDistribution extends JavaBase {
       return fetchedDragonwellJson;
     } catch (err) {
       core.debug(
-        `Fetching Dragonwell versions info from the primary link: ${primaryUrl} ended up with the error: ${
-          (err as Error).message
-        }`
+        `Fetching Dragonwell versions info from the primary link: ${primaryUrl} ended up with the error: ${err.message}`
       );
       return null;
     }
@@ -234,9 +232,7 @@ export class DragonwellDistribution extends JavaBase {
       return fetchedDragonwellJson;
     } catch (err) {
       core.debug(
-        `Fetching Dragonwell versions info from the backup url: ${backupUrl} ended up with the error: ${
-          (err as Error).message
-        }`
+        `Fetching Dragonwell versions info from the backup url: ${backupUrl} ended up with the error: ${err.message}`
       );
       return null;
     }

src/distributions/microsoft/installer.ts

@@ -13,7 +13,7 @@ import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
 import fs from 'fs';
 import path from 'path';
-import {TypedResponse} from '@actions/http-client/lib/interfaces';
+import {ITypedResponse} from '@actions/http-client/interfaces';
 
 export class MicrosoftDistributions extends JavaBase {
   constructor(installerOptions: JavaInstallerOptions) {
@@ -99,7 +99,7 @@ export class MicrosoftDistributions extends JavaBase {
 
     const headers = getGitHubHttpHeaders();
 
-    let response: TypedResponse<tc.IToolRelease[]> | null = null;
+    let response: ITypedResponse<tc.IToolRelease[]> | null = null;
 
     if (core.isDebug()) {
       console.time('Retrieving available versions for Microsoft took'); // eslint-disable-line no-console

src/setup-java.ts

@@ -79,7 +79,7 @@ async function run() {
       await restore(cache, cacheDependencyPath);
     }
   } catch (error) {
-    core.setFailed((error as Error).message);
+    core.setFailed(error.message);
   }
 }