Gitea_Action/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-05-23 02:51:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'adoptium' of https://github.com/joschi/setup-java into adoptium

Browse Source
This commit is contained in:
Maxim Lobanov 2021-08-05 20:04:08 +03:00
commit 4fa0d7379d
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
__tests__/distributors/base-installer.test.ts
View File

@ -312,7 +312,9 @@ describe('normalizeVersion', () => {
['11.0', { version: '11.0', stable: true }], ['11.0', { version: '11.0', stable: true }],
['11.0.10', { version: '11.0.10', stable: true }], ['11.0.10', { version: '11.0.10', stable: true }],
['11-ea', { version: '11', stable: false }], ['11-ea', { version: '11', stable: false }],
['11.0.2-ea', { version: '11.0.2', stable: false }] ['11.0.2-ea', { version: '11.0.2', stable: false }],
['17.0.0-beta', { version: '17.0.0', stable: false }],
['17.0.0-beta+33.0', { version: '17.0.0+33.0', stable: false }]
])('normalizeVersion from %s to %s', (input, expected) => { ])('normalizeVersion from %s to %s', (input, expected) => {
expect(DummyJavaBase.prototype.normalizeVersion.call(null, input)).toEqual(expected); expect(DummyJavaBase.prototype.normalizeVersion.call(null, input)).toEqual(expected);
}); });

9
dist/setup/index.js vendored
View File

@ -4068,6 +4068,15 @@ class JavaBase {
version = version.replace('-ea.', '+'); version = version.replace('-ea.', '+');
stable = false; stable = false;
} }
else if (version.endsWith('-beta')) {
version = version.replace(/-beta$/, '');
stable = false;
}
else if (version.includes('-beta+')) {
// transform '11.0.0-beta+33' -> '11.0.3+33'
version = version.replace('-beta', '');
stable = false;
}
if (!semver_1.default.validRange(version)) { if (!semver_1.default.validRange(version)) {
throw new Error(`The string '${version}' is not valid SemVer notation for a Java version. Please check README file for code snippets and more detailed information`); throw new Error(`The string '${version}' is not valid SemVer notation for a Java version. Please check README file for code snippets and more detailed information`);
} }

7
src/distributions/base-installer.ts
View File

@ -127,6 +127,13 @@ export abstract class JavaBase {
// transform '11.0.3-ea.2' -> '11.0.3+2' // transform '11.0.3-ea.2' -> '11.0.3+2'
version = version.replace('-ea.', '+'); version = version.replace('-ea.', '+');
stable = false; stable = false;
} else if (version.endsWith('-beta')) {
version = version.replace(/-beta$/, '');
stable = false;
} else if (version.includes('-beta+')) {
// transform '11.0.0-beta+33' -> '11.0.3+33'
version = version.replace('-beta', '');
stable = false;
} }
if (!semver.validRange(version)) { if (!semver.validRange(version)) {