Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/e2e-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,14 @@ jobs:
version: 25
- distribution: oracle
os: macos-15-intel
version: 21
version: 25
- distribution: oracle
os: windows-latest
version: 21
version: 25
- distribution: oracle
os: ubuntu-latest
version: 25
# Oracle no longer publishes JDK 21 under /latest, so a major-only request resolves to the archived GA build.
- distribution: oracle
os: ubuntu-latest
version: 21
Expand Down Expand Up @@ -127,7 +131,7 @@ jobs:
JAVA_VERSION: ${{ matrix.version }}
JAVA_PATH: ${{ steps.setup-java.outputs.path }}
SETUP_JAVA_VERSION: ${{ steps.setup-java.outputs.version }}
REQUIRE_CONCRETE_VERSION: ${{ (matrix.distribution == 'oracle' || matrix.distribution == 'graalvm') && !contains(matrix.version, '.') && !contains(matrix.version, '-ea') }}
REQUIRE_CONCRETE_VERSION: ${{ ((matrix.distribution == 'oracle' && matrix.version != 21) || matrix.distribution == 'graalvm') && !contains(matrix.version, '.') && !contains(matrix.version, '-ea') }}
run: bash __tests__/verify-java.sh "$JAVA_VERSION" "$JAVA_PATH" "$SETUP_JAVA_VERSION" "$REQUIRE_CONCRETE_VERSION"
shell: bash

Expand Down
13 changes: 13 additions & 0 deletions __tests__/distributors/oracle-installer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,19 @@ describe('findPackageForDownload', () => {
expect(spyHttpClientGet).toHaveBeenCalledTimes(1);
});

it('warns when a major-only request falls back to the archived GA release', async () => {
spyHttpClient = jest.spyOn(HttpClient.prototype, 'head');
spyHttpClient
.mockResolvedValueOnce({message: {statusCode: 404}})
.mockResolvedValueOnce({message: {statusCode: 200}});

await distribution['findPackageForDownload']('21');

expect(core.warning).toHaveBeenCalledWith(
'Oracle JDK 21 is no longer available from the latest endpoint. Falling back to its archived GA release, which may not include security updates.'
);
});

it('always resolves major-only requests remotely', () => {
expect(distribution['requiresRemoteResolution']()).toBe(true);
const exactDistribution = new OracleDistribution({
Expand Down
7 changes: 7 additions & 0 deletions dist/setup/182.index.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class OracleDistribution extends _base_installer_js__WEBPACK_IMPORTED_MODULE_3__
possibleUrls.push(`${ORACLE_DL_BASE}/${major}/latest/jdk-${major}_${platform}-${arch}_bin.${extension}`);
}
const floatingUrl = isOnlyMajorProvided ? possibleUrls[0] : undefined;
let latestUrlNotFound = false;
possibleUrls.push(`${ORACLE_DL_BASE}/${major}/archive/jdk-${range}_${platform}-${arch}_bin.${extension}`);
if (parseInt(major) < 17) {
throw new Error('Oracle JDK is only supported for JDK 17 and later');
Expand All @@ -90,6 +91,9 @@ class OracleDistribution extends _base_installer_js__WEBPACK_IMPORTED_MODULE_3__
const response = await this.http.head(url);
if (response.message.statusCode === _actions_http_client__WEBPACK_IMPORTED_MODULE_5__/* .HttpCodes */ .Hv.OK) {
const floating = url === floatingUrl;
if (latestUrlNotFound) {
_actions_core__WEBPACK_IMPORTED_MODULE_0__/* .warning */ .$e(`Oracle JDK ${major} is no longer available from the latest endpoint. Falling back to its archived GA release, which may not include security updates.`);
}
return {
url,
version: range,
Expand All @@ -100,6 +104,9 @@ class OracleDistribution extends _base_installer_js__WEBPACK_IMPORTED_MODULE_3__
: undefined
};
}
if (url === floatingUrl) {
latestUrlNotFound = true;
}
if (response.message.statusCode !== _actions_http_client__WEBPACK_IMPORTED_MODULE_5__/* .HttpCodes */ .Hv.NotFound) {
throw new Error(`Http request for Oracle JDK failed with status code: ${response.message.statusCode}`);
}
Expand Down
10 changes: 10 additions & 0 deletions src/distributions/oracle/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ export class OracleDistribution extends JavaBase {
);
}
const floatingUrl = isOnlyMajorProvided ? possibleUrls[0] : undefined;
let latestUrlNotFound = false;

possibleUrls.push(
`${ORACLE_DL_BASE}/${major}/archive/jdk-${range}_${platform}-${arch}_bin.${extension}`
Expand All @@ -123,6 +124,11 @@ export class OracleDistribution extends JavaBase {

if (response.message.statusCode === HttpCodes.OK) {
const floating = url === floatingUrl;
if (latestUrlNotFound) {
core.warning(
`Oracle JDK ${major} is no longer available from the latest endpoint. Falling back to its archived GA release, which may not include security updates.`
);
}
return {
url,
version: range,
Expand All @@ -134,6 +140,10 @@ export class OracleDistribution extends JavaBase {
};
}

if (url === floatingUrl) {
latestUrlNotFound = true;
}

if (response.message.statusCode !== HttpCodes.NotFound) {
throw new Error(
`Http request for Oracle JDK failed with status code: ${response.message.statusCode}`
Expand Down
Loading