actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-06-30 04:54:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

added libc_type

Browse source
This commit is contained in:
Gerrit Grunwald 2021-05-06 17:37:47 +02:00
commit 51e12f8439
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dist/cleanup/index.js vendored
View file

@ -1031,7 +1031,7 @@ exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined; exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;
exports.INPUT_DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE'; exports.INPUT_DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE';
exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = 'gpg-private-key-fingerprint'; exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = 'gpg-private-key-fingerprint';
exports.DISCO_URL = 'https://stage.api.foojay.io'; exports.DISCO_URL = 'https://api.foojay.io';
exports.PACKAGES_PATH = '/disco/v1.0/packages'; exports.PACKAGES_PATH = '/disco/v1.0/packages';
exports.EPHEMERAL_IDS_PATH = '/disco/v1.0/ephemeral_ids'; exports.EPHEMERAL_IDS_PATH = '/disco/v1.0/ephemeral_ids';
exports.DISTROS = [ exports.DISTROS = [

7
dist/setup/index.js vendored
View file

@ -25768,7 +25768,7 @@ exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined; exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;
exports.INPUT_DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE'; exports.INPUT_DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE';
exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = 'gpg-private-key-fingerprint'; exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = 'gpg-private-key-fingerprint';
exports.DISCO_URL = 'https://stage.api.foojay.io'; exports.DISCO_URL = 'https://api.foojay.io';
exports.PACKAGES_PATH = '/disco/v1.0/packages'; exports.PACKAGES_PATH = '/disco/v1.0/packages';
exports.EPHEMERAL_IDS_PATH = '/disco/v1.0/ephemeral_ids'; exports.EPHEMERAL_IDS_PATH = '/disco/v1.0/ephemeral_ids';
exports.DISTROS = [ exports.DISTROS = [
@ -33694,19 +33694,23 @@ function getDownloadInfo(refs, version, arch, javaPackage, distro = 'zulu') {
distribution = 'zulu'; distribution = 'zulu';
} }
let archiveType; let archiveType;
let libcType;
if (IS_WINDOWS) { if (IS_WINDOWS) {
operatingSystem = 'windows'; operatingSystem = 'windows';
archiveType = 'zip'; archiveType = 'zip';
libcType = 'c_std_lib';
} }
else { else {
if (process.platform === 'darwin') { if (process.platform === 'darwin') {
operatingSystem = 'macos'; operatingSystem = 'macos';
let zipArchive = distribution === 'liberica' || distribution === 'openlogic'; let zipArchive = distribution === 'liberica' || distribution === 'openlogic';
archiveType = zipArchive ? 'zip' : 'tar.gz'; archiveType = zipArchive ? 'zip' : 'tar.gz';
libcType = 'libc';
} }
else { else {
operatingSystem = 'linux'; operatingSystem = 'linux';
archiveType = distribution === 'ojdk_build' ? 'zip' : 'tar.gz'; archiveType = distribution === 'ojdk_build' ? 'zip' : 'tar.gz';
libcType = 'glibc';
} }
} }
let url = constants_1.DISCO_URL + constants_1.PACKAGES_PATH; let url = constants_1.DISCO_URL + constants_1.PACKAGES_PATH;
@ -33728,6 +33732,7 @@ function getDownloadInfo(refs, version, arch, javaPackage, distro = 'zulu') {
url += '&architecture=' + architecture; url += '&architecture=' + architecture;
url += '&operating_system=' + operatingSystem; url += '&operating_system=' + operatingSystem;
url += '&archive_type=' + archiveType; url += '&archive_type=' + archiveType;
url += '&libc_type=' + libcType;
if (version.includes('x') || if (version.includes('x') ||
version.includes('ea') || version.includes('ea') ||
version.startsWith('1.')) { version.startsWith('1.')) {

5
src/installer.ts
View file

@ -220,18 +220,22 @@ async function getDownloadInfo(
distribution = 'zulu'; distribution = 'zulu';
} }
let archiveType; let archiveType;
let libcType;
if (IS_WINDOWS) { if (IS_WINDOWS) {
operatingSystem = 'windows'; operatingSystem = 'windows';
archiveType = 'zip'; archiveType = 'zip';
libcType = 'c_std_lib';
} else { } else {
if (process.platform === 'darwin') { if (process.platform === 'darwin') {
operatingSystem = 'macos'; operatingSystem = 'macos';
let zipArchive = let zipArchive =
distribution === 'liberica' || distribution === 'openlogic'; distribution === 'liberica' || distribution === 'openlogic';
archiveType = zipArchive ? 'zip' : 'tar.gz'; archiveType = zipArchive ? 'zip' : 'tar.gz';
libcType = 'libc';
} else { } else {
operatingSystem = 'linux'; operatingSystem = 'linux';
archiveType = distribution === 'ojdk_build' ? 'zip' : 'tar.gz'; archiveType = distribution === 'ojdk_build' ? 'zip' : 'tar.gz';
libcType = 'glibc';
} }
} }
@ -253,6 +257,7 @@ async function getDownloadInfo(
url += '&architecture=' + architecture; url += '&architecture=' + architecture;
url += '&operating_system=' + operatingSystem; url += '&operating_system=' + operatingSystem;
url += '&archive_type=' + archiveType; url += '&archive_type=' + archiveType;
url += '&libc_type=' + libcType;
if ( if (
version.includes('x') || version.includes('x') ||
version.includes('ea') || version.includes('ea') ||