From 2363249e9f2410ce29d0fc9f65f32665b6c56ac4 Mon Sep 17 00:00:00 2001 From: Gerrit Grunwald Date: Fri, 12 Mar 2021 11:07:58 +0100 Subject: [PATCH] new build --- dist/cleanup/index.js | 4 ++-- dist/setup/index.js | 10 ++++++---- src/installer.ts | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index c7cdd827..fb29d8d5 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -1031,7 +1031,7 @@ exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase'; exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined; exports.INPUT_DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE'; exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = 'gpg-private-key-fingerprint'; -exports.DISCO_URL = 'https://api.foojay.io'; +exports.DISCO_URL = 'https://stage.api.foojay.io'; exports.PACKAGES_PATH = '/disco/v1.0/packages'; exports.EPHEMERAL_IDS_PATH = '/disco/v1.0/ephemeral_ids'; exports.DISTROS = [ @@ -1041,7 +1041,7 @@ exports.DISTROS = [ 'dragonwell', 'liberica', 'ojdk_build', - 'oracle_open_jdk', + 'oracle_openjdk', 'sap_machine', 'zulu' ]; diff --git a/dist/setup/index.js b/dist/setup/index.js index ab4c3650..6c208094 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -25768,7 +25768,7 @@ exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase'; exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined; exports.INPUT_DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE'; exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = 'gpg-private-key-fingerprint'; -exports.DISCO_URL = 'https://api.foojay.io'; +exports.DISCO_URL = 'https://stage.api.foojay.io'; exports.PACKAGES_PATH = '/disco/v1.0/packages'; exports.EPHEMERAL_IDS_PATH = '/disco/v1.0/ephemeral_ids'; exports.DISTROS = [ @@ -25778,7 +25778,7 @@ exports.DISTROS = [ 'dragonwell', 'liberica', 'ojdk_build', - 'oracle_open_jdk', + 'oracle_openjdk', 'sap_machine', 'zulu' ]; @@ -33684,7 +33684,7 @@ function getDownloadInfo(refs, version, arch, javaPackage, distro) { distribution = distro.toLowerCase(); } else { - throw new Error(`distro argument '${distro}' is not in [aoj | aoj_openj9 | corretto | dragonwell | liberica | ojdk_build | oracle_open_jdk | sap_machine | zulu]`); + throw new Error(`distro argument '${distro}' is not in [aoj | aoj_openj9 | corretto | dragonwell | liberica | ojdk_build | oracle_openjdk | sap_machine | zulu]`); } } else { @@ -33734,7 +33734,9 @@ function getDownloadInfo(refs, version, arch, javaPackage, distro) { else { url += '&package_type=' + packageType; } - url += '&release_status=ea'; + if (version.includes('ea')) { + url += '&release_status=ea'; + } url += '&release_status=ga'; url += '&architecture=' + architecture; url += '&operating_system=' + operatingSystem; diff --git a/src/installer.ts b/src/installer.ts index 1d020b1c..eef38478 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -266,8 +266,8 @@ async function getDownloadInfo( } else { url += '&package_type=' + packageType; } - if (version.includes('ea') { - url += '&release_status=ea'; + if (version.includes('ea')) { + url += '&release_status=ea'; } url += '&release_status=ga'; url += '&architecture=' + architecture;