actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-19 17:36:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor improvements

Browse source
This commit is contained in:
Maxim Lobanov 2021-03-08 18:21:32 +03:00
parent b2da088220
commit cfdcd6827b
6 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
action.yml
View file

@ -10,7 +10,7 @@ inputs:
description: 'Java distribution. See the list of supported distributions in README file' description: 'Java distribution. See the list of supported distributions in README file'
required: false required: false
java-package: java-package:
description: 'The package type (jdk, jre)' description: 'The package type (jdk, jre, jdk+fx, jre+fx)'
required: false required: false
default: 'jdk' default: 'jdk'
architecture: architecture:

4
dist/cleanup/index.js vendored
View file

@ -4929,8 +4929,8 @@ function isUnixExecutable(stats) {
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION = exports.macOSJavaContentDir = void 0; exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0;
exports.macOSJavaContentDir = 'Contents/Home'; exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home';
exports.INPUT_JAVA_VERSION = 'java-version'; exports.INPUT_JAVA_VERSION = 'java-version';
exports.INPUT_ARCHITECTURE = 'architecture'; exports.INPUT_ARCHITECTURE = 'architecture';
exports.INPUT_JAVA_PACKAGE = 'java-package'; exports.INPUT_JAVA_PACKAGE = 'java-package';

10
dist/setup/index.js vendored
View file

@ -9368,8 +9368,8 @@ class LocalDistribution extends base_installer_1.JavaBase {
const javaVersion = this.version.raw; const javaVersion = this.version.raw;
let javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, this.getToolcacheVersionName(javaVersion), this.architecture); let javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, this.getToolcacheVersionName(javaVersion), this.architecture);
if (process.platform === 'darwin' && if (process.platform === 'darwin' &&
fs_1.default.existsSync(path_1.default.join(javaPath, constants_1.macOSJavaContentDir))) { fs_1.default.existsSync(path_1.default.join(javaPath, constants_1.MACOS_JAVA_CONTENT_POSTFIX))) {
javaPath = path_1.default.join(javaPath, constants_1.macOSJavaContentDir); javaPath = path_1.default.join(javaPath, constants_1.MACOS_JAVA_CONTENT_POSTFIX);
} }
foundJava = { foundJava = {
version: javaVersion, version: javaVersion,
@ -11291,8 +11291,8 @@ exports.HTMLCollectionImpl = HTMLCollectionImpl;
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION = exports.macOSJavaContentDir = void 0; exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0;
exports.macOSJavaContentDir = 'Contents/Home'; exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home';
exports.INPUT_JAVA_VERSION = 'java-version'; exports.INPUT_JAVA_VERSION = 'java-version';
exports.INPUT_ARCHITECTURE = 'architecture'; exports.INPUT_ARCHITECTURE = 'architecture';
exports.INPUT_JAVA_PACKAGE = 'java-package'; exports.INPUT_JAVA_PACKAGE = 'java-package';
@ -13793,7 +13793,7 @@ class AdoptiumDistribution extends base_installer_1.JavaBase {
const version = this.getToolcacheVersionName(javaRelease.version); const version = this.getToolcacheVersionName(javaRelease.version);
javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture); javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture);
if (process.platform === 'darwin') { if (process.platform === 'darwin') {
javaPath = path_1.default.join(javaPath, constants_1.macOSJavaContentDir); javaPath = path_1.default.join(javaPath, constants_1.MACOS_JAVA_CONTENT_POSTFIX);
} }
return { version: javaRelease.version, path: javaPath }; return { version: javaRelease.version, path: javaPath };
}); });

2
src/constants.ts
View file

@ -1,4 +1,4 @@
export const macOSJavaContentDir = 'Contents/Home'; export const MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home';
export const INPUT_JAVA_VERSION = 'java-version'; export const INPUT_JAVA_VERSION = 'java-version';
export const INPUT_ARCHITECTURE = 'architecture'; export const INPUT_ARCHITECTURE = 'architecture';
export const INPUT_JAVA_PACKAGE = 'java-package'; export const INPUT_JAVA_PACKAGE = 'java-package';

4
src/distributions/adoptium/installer.ts
View file

@ -8,7 +8,7 @@ import semver from 'semver';
import { JavaBase } from '../base-installer'; import { JavaBase } from '../base-installer';
import { IAdoptiumAvailableVersions } from './models'; import { IAdoptiumAvailableVersions } from './models';
import { JavaInstallerOptions, JavaDownloadRelease, JavaInstallerResults } from '../base-models'; import { JavaInstallerOptions, JavaDownloadRelease, JavaInstallerResults } from '../base-models';
import { macOSJavaContentDir } from '../../constants'; import { MACOS_JAVA_CONTENT_POSTFIX } from '../../constants';
import { extractJdkFile, getDownloadArchiveExtension } from '../../util'; import { extractJdkFile, getDownloadArchiveExtension } from '../../util';
export class AdoptiumDistribution extends JavaBase { export class AdoptiumDistribution extends JavaBase {
@ -68,7 +68,7 @@ export class AdoptiumDistribution extends JavaBase {
javaPath = await tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture); javaPath = await tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture);
if (process.platform === 'darwin') { if (process.platform === 'darwin') {
javaPath = path.join(javaPath, macOSJavaContentDir); javaPath = path.join(javaPath, MACOS_JAVA_CONTENT_POSTFIX);
} }
return { version: javaRelease.version, path: javaPath }; return { version: javaRelease.version, path: javaPath };

7
src/distributions/local/installer.ts
View file

@ -8,7 +8,7 @@ import semver from 'semver';
import { JavaBase } from '../base-installer'; import { JavaBase } from '../base-installer';
import { JavaInstallerOptions, JavaDownloadRelease, JavaInstallerResults } from '../base-models'; import { JavaInstallerOptions, JavaDownloadRelease, JavaInstallerResults } from '../base-models';
import { extractJdkFile } from '../../util'; import { extractJdkFile } from '../../util';
import { macOSJavaContentDir } from '../../constants'; import { MACOS_JAVA_CONTENT_POSTFIX } from '../../constants';
export class LocalDistribution extends JavaBase { export class LocalDistribution extends JavaBase {
constructor(installerOptions: JavaInstallerOptions, private jdkFile?: string) { constructor(installerOptions: JavaInstallerOptions, private jdkFile?: string) {
@ -48,11 +48,12 @@ export class LocalDistribution extends JavaBase {
this.architecture this.architecture
); );
// for different Java distributions, postfix can exist or not so need to check both cases
if ( if (
process.platform === 'darwin' && process.platform === 'darwin' &&
fs.existsSync(path.join(javaPath, macOSJavaContentDir)) fs.existsSync(path.join(javaPath, MACOS_JAVA_CONTENT_POSTFIX))
) { ) {
javaPath = path.join(javaPath, macOSJavaContentDir); javaPath = path.join(javaPath, MACOS_JAVA_CONTENT_POSTFIX);
} }
foundJava = { foundJava = {