Merge "v2-preview" branch into "main" (#150)

* actions/setup-java@v2 - Support different distributions (#132) * Implement support for custom vendors in setup-java * minor improvements * minor refactoring * Add unit tests and e2e tests * Update documentation for setup-java@v2 release * minor improvements * regenerate dist * fix comments * resolve comments * resolve comments * fix tests * Update README.md Co-authored-by: George Adams <george.adams@microsoft.com> * Apply suggestions from code review Co-authored-by: Konrad Pabjan <konradpabjan@github.com> * fix minor nitpicks * handle 4th digit * pull latest main * Update README.md * rename adoptium to adopt * rename adoptium to adopt * rename adoptium to adopt * Update README.md * make java-version and distribution required for action * update readme * fix tests * fix e2e tests Co-authored-by: George Adams <george.adams@microsoft.com> Co-authored-by: Konrad Pabjan <konradpabjan@github.com> * Add "overwrite-settings" input parameter (#136) * add overwrite-settings parameter * fix e2e tests * print debug * fix e2e tests * add comment * remove comment * Add "Contents/Home" postfix on macOS if provider creates it (#139) * Update e2e-versions.yml * Update e2e-versions.yml * implement fix * Update e2e-versions.yml * Update installer.ts * fix filter logic * Update e2e-versions.yml * remove extra logic * Update e2e-versions.yml * Add check-latest flag (#141) * add changes for check-latest * run prerelease script * resolving comments * fixing tests * fix spelling * improve core.info messages * run format * run prerelease * change version to fix test * resolve comment for check-latest * Update README.md * added hosted tool cache section * Apply suggestions from code review Co-authored-by: Maxim Lobanov <v-malob@microsoft.com> Co-authored-by: Konrad Pabjan <konradpabjan@github.com> * Avoid "+" sign in Java path in v2-preview (#145) * try to handle _ versions * more logs * more debug * test 1 * more fixes * fix typo * Update e2e-versions.yml * add unit-tests * remove debug info from tests * debug pre-cached versions * change e2e tests to ubuntu-latest * update npm licenses Co-authored-by: George Adams <george.adams@microsoft.com> Co-authored-by: Konrad Pabjan <konradpabjan@github.com> Co-authored-by: Dmitry Shibanov <dmitry-shibanov@github.com>
2025-06-29 04:24:14 +00:00 · 2021-04-05 13:02:27 +03:00 · 2021-04-05 13:02:27 +03:00 · b53500dabc
commit b53500dabc
parent ebb424f2cb
67 changed files with 40956 additions and 22218 deletions
--- a/src/distributions/local/installer.ts
+++ b/src/distributions/local/installer.ts
@ -0,0 +1,76 @@
+import * as tc from '@actions/tool-cache';
+import * as core from '@actions/core';
+
+import fs from 'fs';
+import path from 'path';
+import semver from 'semver';
+
+import { JavaBase } from '../base-installer';
+import { JavaInstallerOptions, JavaDownloadRelease, JavaInstallerResults } from '../base-models';
+import { extractJdkFile } from '../../util';
+import { MACOS_JAVA_CONTENT_POSTFIX } from '../../constants';
+
+export class LocalDistribution extends JavaBase {
+  constructor(installerOptions: JavaInstallerOptions, private jdkFile?: string) {
+    super('jdkfile', installerOptions);
+  }
+
+  public async setupJava(): Promise<JavaInstallerResults> {
+    let foundJava = this.findInToolcache();
+
+    if (foundJava) {
+      core.info(`Resolved Java ${foundJava.version} from tool-cache`);
+    } else {
+      core.info(`Java ${this.version} was not found in tool-cache. Trying to unpack JDK file...`);
+      if (!this.jdkFile) {
+        throw new Error("'jdkFile' is not specified");
+      }
+      const jdkFilePath = path.resolve(this.jdkFile);
+      const stats = fs.statSync(jdkFilePath);
+
+      if (!stats.isFile()) {
+        throw new Error(`JDK file was not found in path '${jdkFilePath}'`);
+      }
+
+      core.info(`Extracting Java from '${jdkFilePath}'`);
+
+      const extractedJavaPath = await extractJdkFile(jdkFilePath);
+      const archiveName = fs.readdirSync(extractedJavaPath)[0];
+      const archivePath = path.join(extractedJavaPath, archiveName);
+      const javaVersion = this.version;
+
+      let javaPath = await tc.cacheDir(
+        archivePath,
+        this.toolcacheFolderName,
+        this.getToolcacheVersionName(javaVersion),
+        this.architecture
+      );
+
+      // for different Java distributions, postfix can exist or not so need to check both cases
+      if (
+        process.platform === 'darwin' &&
+        fs.existsSync(path.join(javaPath, MACOS_JAVA_CONTENT_POSTFIX))
+      ) {
+        javaPath = path.join(javaPath, MACOS_JAVA_CONTENT_POSTFIX);
+      }
+
+      foundJava = {
+        version: javaVersion,
+        path: javaPath
+      };
+    }
+
+    core.info(`Setting Java ${foundJava.version} as default`);
+
+    this.setJavaDefault(foundJava.version, foundJava.path);
+    return foundJava;
+  }
+
+  protected async findPackageForDownload(version: string): Promise<JavaDownloadRelease> {
+    throw new Error('This method should not be implemented in local file provider');
+  }
+
+  protected async downloadTool(javaRelease: JavaDownloadRelease): Promise<JavaInstallerResults> {
+    throw new Error('This method should not be implemented in local file provider');
+  }
+}