Add fix for major coretto version and ea. (#1)

* Fix typo in README.md (#419) `diractory` -> `directory` * Revert "Add support for Oracle JDK (#401)" (#421) This reverts commit 6cdf39a6b6. Co-authored-by: Brian Cristante <33549821+brcrista@users.noreply.github.com> * adding check for prerelease * add debug lines * add minor fix * expand e2e tests with corretto Co-authored-by: Ashley <73482956+ascopes@users.noreply.github.com> Co-authored-by: Brian Cristante <33549821+brcrista@users.noreply.github.com>
2025-04-19 09:26:46 +00:00 · 2022-12-09 12:29:13 +01:00 · 2022-12-09 12:29:13 +01:00 · a7975de1a7
commit a7975de1a7
parent 10d2aa6bfd
12 changed files with 7373 additions and 7726 deletions
--- a/.github/workflows/e2e-versions.yml
+++ b/.github/workflows/e2e-versions.yml
@ -25,16 +25,6 @@ jobs:
        exclude:
        - distribution: microsoft
          version: 8
-        include:
-        - distribution: oracle
-          os: macos-latest
-          version: 17
-        - distribution: oracle
-          os: windows-latest
-          version: 19
-        - distribution: oracle
-          os: ubuntu-latest
-          version: 19
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@ -61,10 +51,6 @@ jobs:
        - '11.0'
        - '8.0.302'
        - '16.0.2+7'
-        include:
-        - distribution: oracle
-          os: ubuntu-latest
-          version: '19.0.1'
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@ -261,7 +247,7 @@ jobs:
      fail-fast: false
      matrix:
        os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'zulu', 'microsoft' ]
+        distribution: ['temurin', 'microsoft', 'corretto' ]
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@ -286,7 +272,7 @@ jobs:
      fail-fast: false
      matrix:
        os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'zulu', 'liberica', 'microsoft' ]
+        distribution: ['temurin', 'zulu', 'liberica', 'microsoft', 'corretto' ]
    steps:
      - name: Checkout
        uses: actions/checkout@v3
--- a/README.md
+++ b/README.md
@ -50,7 +50,7 @@ This action allows you to work with Java and Scala projects.

  - `server-password`: Environment variable name for password or token for authentication to the Apache Maven repository. Default is GITHUB_TOKEN.

-  - `settings-path`: Maven related setting to point to the diractory where the settings.xml file will be written. Default is ~/.m2.
+  - `settings-path`: Maven related setting to point to the directory where the settings.xml file will be written. Default is ~/.m2.

  - `gpg-private-key`: GPG private key to import. Default is empty string.'

@ -101,7 +101,6 @@ Currently, the following distributions are supported:
 | `liberica` | Liberica JDK | [Link](https://bell-sw.com/) | [Link](https://bell-sw.com/liberica_eula/) |
 | `microsoft` | Microsoft Build of OpenJDK | [Link](https://www.microsoft.com/openjdk) | [Link](https://docs.microsoft.com/java/openjdk/faq)
 | `corretto` | Amazon Corretto Build of OpenJDK | [Link](https://aws.amazon.com/corretto/) | [Link](https://aws.amazon.com/corretto/faqs/)
-| `oracle` | Oracle JDK | [Link](https://www.oracle.com/java/technologies/downloads/) | [Link](https://java.com/freeuselicense)

 **NOTE:** The different distributors can provide discrepant list of available versions / supported configurations. Please refer to the official documentation to see the list of supported versions.

--- a/tests/distributors/oracle-installer.test.ts
+++ b/tests/distributors/oracle-installer.test.ts
@ -1,97 +0,0 @@
-import { OracleDistribution } from '../../src/distributions/oracle/installer';
-import os from 'os';
-import * as core from '@actions/core';
-import { getDownloadArchiveExtension } from '../../src/util';
-
-describe('findPackageForDownload', () => {
-  let distribution: OracleDistribution;
-  let spyDebug: jest.SpyInstance;
-
-  beforeEach(() => {
-    distribution = new OracleDistribution({
-      version: '',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-
-    spyDebug = jest.spyOn(core, 'debug');
-    spyDebug.mockImplementation(() => {});
-  });
-
-  it.each([
-    [
-      '19',
-      '19',
-      'https://download.oracle.com/java/19/latest/jdk-19_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '19.0.1',
-      '19.0.1',
-      'https://download.oracle.com/java/19/archive/jdk-19.0.1_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '18.0.2.1',
-      '18.0.2.1',
-      'https://download.oracle.com/java/18/archive/jdk-18.0.2.1_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '17',
-      '17',
-      'https://download.oracle.com/java/17/latest/jdk-17_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '17.0.1',
-      '17.0.1',
-      'https://download.oracle.com/java/17/archive/jdk-17.0.1_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ]
-  ])('version is %s -> %s', async (input, expectedVersion, expectedUrl) => {
-    const result = await distribution['findPackageForDownload'](input);
-    expect(result.version).toBe(expectedVersion);
-    const osType = distribution.getPlatform();
-    const archiveType = getDownloadArchiveExtension();
-    const url = expectedUrl.replace('{{OS_TYPE}}', osType).replace('{{ARCHIVE_TYPE}}', archiveType);
-    expect(result.url).toBe(url);
-  });
-
-  it.each([
-    ['amd64', 'x64'],
-    ['arm64', 'aarch64']
-  ])(
-    'defaults to os.arch(): %s mapped to distro arch: %s',
-    async (osArch: string, distroArch: string) => {
-      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-      jest.spyOn(os, 'platform').mockReturnValue('linux');
-
-      const version = '17';
-      const distro = new OracleDistribution({
-        version,
-        architecture: '', // to get default value
-        packageType: 'jdk',
-        checkLatest: false
-      });
-
-      const osType = distribution.getPlatform();
-      if (osType === 'windows' && distroArch == 'aarch64') {
-        return; // skip, aarch64 is not available for Windows
-      }
-      const archiveType = getDownloadArchiveExtension();
-      const result = await distro['findPackageForDownload'](version);
-      const expectedUrl = `https://download.oracle.com/java/17/latest/jdk-17_${osType}-${distroArch}_bin.${archiveType}`;
-
-      expect(result.url).toBe(expectedUrl);
-    }
-  );
-
-  it('should throw an error', async () => {
-    await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-      /Oracle JDK is only supported for JDK 17 and later/
-    );
-    await expect(distribution['findPackageForDownload']('11')).rejects.toThrow(
-      /Oracle JDK is only supported for JDK 17 and later/
-    );
-    await expect(distribution['findPackageForDownload']('18')).rejects.toThrow(
-      /Could not find Oracle JDK for SemVer */
-    );
-  });
-});
--- a/tests/verify-java.sh
+++ b/tests/verify-java.sh
@ -24,7 +24,7 @@ fi
 ACTUAL_JAVA_VERSION="$(java -version 2>&1)"
 echo "Found java version: $ACTUAL_JAVA_VERSION"

-GREP_RESULT=$(echo $ACTUAL_JAVA_VERSION | grep -E "^(openjdk|java) version \"$EXPECTED_JAVA_VERSION")
+GREP_RESULT=$(echo $ACTUAL_JAVA_VERSION | grep "^openjdk version \"$EXPECTED_JAVA_VERSION")
 if [ -z "$GREP_RESULT" ]; then
  echo "::error::Unexpected version"
  echo "Expected version: $EXPECTED_JAVA_VERSION"
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
--- a/docs/advanced-usage.md
+++ b/docs/advanced-usage.md
@ -6,7 +6,6 @@
  - [Liberica](#Liberica)
  - [Microsoft](#Microsoft)
  - [Amazon Corretto](#Amazon-Corretto)
-  - [Oracle](#Oracle)
 - [Installing custom Java package type](#Installing-custom-Java-package-type)
 - [Installing custom Java architecture](#Installing-custom-Java-architecture)
 - [Installing custom Java distribution from local file](#Installing-Java-from-local-file)
@ -111,19 +110,6 @@ steps:
 - run: java -cp java HelloWorldApp
 ```

-### Oracle
-**NOTE:** Oracle Java SE Development Kit is only available for version 17 and later.
-
-```yaml
-steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
-  with:
-    distribution: 'oracle'
-    java-version: '17'
- run: java -cp java HelloWorldApp
-```
-
 ## Installing custom Java package type
 ```yaml
 steps:
--- a/src/distributions/distribution-factory.ts
+++ b/src/distributions/distribution-factory.ts
@ -7,7 +7,6 @@ import { TemurinDistribution, TemurinImplementation } from './temurin/installer'
 import { LibericaDistributions } from './liberica/installer';
 import { MicrosoftDistributions } from './microsoft/installer';
 import { CorrettoDistribution } from './corretto/installer';
-import { OracleDistribution } from './oracle/installer';

 enum JavaDistribution {
  Adopt = 'adopt',
@ -18,8 +17,7 @@ enum JavaDistribution {
  Liberica = 'liberica',
  JdkFile = 'jdkfile',
  Microsoft = 'microsoft',
-  Corretto = 'corretto',
-  Oracle = 'oracle'
+  Corretto = 'corretto'
 }

 export function getJavaDistribution(
@ -45,8 +43,6 @@ export function getJavaDistribution(
      return new MicrosoftDistributions(installerOptions);
    case JavaDistribution.Corretto:
      return new CorrettoDistribution(installerOptions);
-    case JavaDistribution.Oracle:
-      return new OracleDistribution(installerOptions);
    default:
      return null;
  }
--- a/src/distributions/oracle/installer.ts
+++ b/src/distributions/oracle/installer.ts
@ -1,103 +0,0 @@
-import * as core from '@actions/core';
-import * as tc from '@actions/tool-cache';
-
-import fs from 'fs';
-import path from 'path';
-
-import { JavaBase } from '../base-installer';
-import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models';
-import { extractJdkFile, getDownloadArchiveExtension } from '../../util';
-import { HttpCodes } from '@actions/http-client';
-
-const ORACLE_DL_BASE = 'https://download.oracle.com/java';
-
-export class OracleDistribution extends JavaBase {
-  constructor(installerOptions: JavaInstallerOptions) {
-    super('Oracle', installerOptions);
-  }
-
-  protected async downloadTool(javaRelease: JavaDownloadRelease): Promise<JavaInstallerResults> {
-    core.info(
-      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
-    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
-
-    core.info(`Extracting Java archive...`);
-    let extension = getDownloadArchiveExtension();
-
-    let extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
-
-    const archiveName = fs.readdirSync(extractedJavaPath)[0];
-    const archivePath = path.join(extractedJavaPath, archiveName);
-    const version = this.getToolcacheVersionName(javaRelease.version);
-
-    let javaPath = await tc.cacheDir(
-      archivePath,
-      this.toolcacheFolderName,
-      version,
-      this.architecture
-    );
-
-    return { version: javaRelease.version, path: javaPath };
-  }
-
-  protected async findPackageForDownload(range: string): Promise<JavaDownloadRelease> {
-    const arch = this.distributionArchitecture();
-    if (arch !== 'x64' && arch !== 'aarch64') {
-      throw new Error(`Unsupported architecture: ${this.architecture}`);
-    }
-
-    if (!this.stable) {
-      throw new Error('Early access versions are not supported');
-    }
-
-    if (this.packageType !== 'jdk') {
-      throw new Error('Oracle JDK provides only the `jdk` package type');
-    }
-
-    const platform = this.getPlatform();
-    const extension = getDownloadArchiveExtension();
-    let major;
-    let fileUrl;
-    if (range.includes('.')) {
-      major = range.split('.')[0];
-      fileUrl = `${ORACLE_DL_BASE}/${major}/archive/jdk-${range}_${platform}-${arch}_bin.${extension}`;
-    } else {
-      major = range;
-      fileUrl = `${ORACLE_DL_BASE}/${range}/latest/jdk-${range}_${platform}-${arch}_bin.${extension}`;
-    }
-
-    if (parseInt(major) < 17) {
-      throw new Error('Oracle JDK is only supported for JDK 17 and later');
-    }
-
-    const response = await this.http.head(fileUrl);
-
-    if (response.message.statusCode === HttpCodes.NotFound) {
-      throw new Error(`Could not find Oracle JDK for SemVer ${range}`);
-    }
-
-    if (response.message.statusCode !== HttpCodes.OK) {
-      throw new Error(
-        `Http request for Oracle JDK failed with status code: ${response.message.statusCode}`
-      );
-    }
-
-    return { url: fileUrl, version: range };
-  }
-
-  public getPlatform(platform: NodeJS.Platform = process.platform): OsVersions {
-    switch (platform) {
-      case 'darwin':
-        return 'macos';
-      case 'win32':
-        return 'windows';
-      case 'linux':
-        return 'linux';
-      default:
-        throw new Error(
-          `Platform '${platform}' is not supported. Supported platforms: 'linux', 'macos', 'windows'`
-        );
-    }
-  }
-}
--- a/src/distributions/oracle/models.ts
+++ b/src/distributions/oracle/models.ts
@ -1 +0,0 @@
-export type OsVersions = 'linux' | 'macos' | 'windows';
--- a/src/setup-java.ts
+++ b/src/setup-java.ts
@ -1,12 +1,7 @@
 import fs from 'fs';
 import * as core from '@actions/core';
 import * as auth from './auth';
-import {
-  getBooleanInput,
-  isCacheFeatureAvailable,
-  getVersionFromFileContent,
-  avoidOldNotation
-} from './util';
+import { getBooleanInput, isCacheFeatureAvailable, getVersionFromFileContent } from './util';
 import * as toolchains from './toolchains';
 import * as constants from './constants';
 import { restore } from './cache';
@ -53,12 +48,13 @@ async function run() {
        .trim();

      const version = getVersionFromFileContent(content, distributionName);
+      core.debug(`Parsed version from file '${version}'`);

      if (!version) {
        throw new Error(`No supported version was found in file ${versionFile}`);
      }

-      await installVersion(version as string, installerInputsOptions);
+      await installVersion(version, installerInputsOptions);
    }

    for (const [index, version] of versions.entries()) {
--- a/src/util.ts
+++ b/src/util.ts
@ -111,24 +111,29 @@ export function getVersionFromFileContent(
  if (!fileContent) {
    return null;
  }
-  const tentativeVersion = avoidOldNotation(fileContent);

-  let version = semver.validRange(tentativeVersion)
-    ? tentativeVersion
-    : semver.coerce(tentativeVersion);
+  core.debug(`Version from file '${fileContent}'`);
+
+  const tentativeVersion = avoidOldNotation(fileContent);
+  const rawVersion = tentativeVersion.split('-')[0];
+
+  let version = semver.validRange(rawVersion) ? tentativeVersion : semver.coerce(tentativeVersion);
+
+  core.debug(`Range version from file is '${version}'`);

  if (!version) {
    return null;
  }

  if (DISTRIBUTIONS_ONLY_MAJOR_VERSION.includes(distributionName)) {
-    version = semver.major(version).toString();
+    const coerceVersion = semver.coerce(version) ?? version;
+    version = semver.major(coerceVersion).toString();
  }

  return version.toString();
 }

 // By convention, action expects version 8 in the format `8.*` instead of `1.8`
-export function avoidOldNotation(content: string): string {
+function avoidOldNotation(content: string): string {
  return content.startsWith('1.') ? content.substring(2) : content;
 }
				`@ -1 +0,0 @@`
				`export type OsVersions = 'linux' \| 'macos' \| 'windows';`