Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Oracle JDK download URL calculation #507

Merged

Conversation

nikolai-laevskii
Copy link
Contributor

Description:
Updates how Oracle JDK download URL is determined.
Previously it would pick either "archive" or "latest" download links depending on whether user specified just major version (it would select "latest") or major.minor.(patch) as well (it would select "archive"). It doesn't seem like a correct logic because it's just the version format, it shouldn't determine whether it should be taken from the archive or from latest. Moreover, links for latest versions are invalidated often which causes tests to fail and may potentially break workflows of some people.

I propose just picking every version from the "archive" as even latest versions added there immediately and archive links don't seem to change that often.

Related issue:
No particular issue

Check list:

  • Mark if documentation changes are required.
  • Mark if tests were added or updated to cover the changes.

@fniephaus
Copy link
Contributor

It doesn't seem like a correct logic because it's just the version format, it shouldn't determine whether it should be taken from the archive or from latest.

The reason for this is to allow users to set java-version to a major number. With this, users must always use the full version number when using Oracle JDK.

If we are moving forward with this PR, then you may also want to update this code snippet.

@nikolai-laevskii
Copy link
Contributor Author

@fniephaus

It doesn't seem like a correct logic because it's just the version format, it shouldn't determine whether it should be taken from the archive or from latest.

The reason for this is to allow users to set java-version to a major number. With this, users must always use the full version number when using Oracle JDK.

If we are moving forward with this PR, then you may also want to update this code snippet.

Thank you for noting this! Could you please elaborate on this a bit further? As of now archive seems to allow downloading with only a major version specified.

@fniephaus
Copy link
Contributor

Thank you for noting this! Could you please elaborate on this a bit further? As of now archive seems to allow downloading with only a major version specified.

You are right, I wasn't aware that these links also work:

Thanks for the PR!

Copy link
Contributor

@fniephaus fniephaus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nikolai-laevskii nikolai-laevskii merged commit 4fb3975 into actions:main Jul 18, 2023
238 checks passed
@nikolai-laevskii nikolai-laevskii deleted the update-oracle-jdk-url-calculation branch July 18, 2023 09:04
ianlewis added a commit to slsa-framework/slsa-github-generator that referenced this pull request Aug 1, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| actions/setup-java | action | digest | `cd89f46` -> `b943a4e` |
| [actions/setup-java](https://togithub.com/actions/setup-java) | action
| minor | `v3.11.0` -> `v3.12.0` |
| [actions/setup-java](https://togithub.com/actions/setup-java) | action
| digest | `5ffc13f` -> `cd89f46` |
| [github/codeql-action](https://togithub.com/github/codeql-action) |
action | patch | `v2.21.0` -> `v2.21.2` |
|
[gradle/gradle-build-action](https://togithub.com/gradle/gradle-build-action)
| action | minor | `v2.6.1` -> `v2.7.0` |

---

### ⚠ Dependency Lookup Warnings ⚠

Warnings were logged while processing this repo. Please check the
Dependency Dashboard for more information.

---

### Release Notes

<details>
<summary>actions/setup-java (actions/setup-java)</summary>

###
[`v3.12.0`](https://togithub.com/actions/setup-java/releases/tag/v3.12.0)

[Compare
Source](https://togithub.com/actions/setup-java/compare/v3.11.0...v3.12.0)

In scope of this release the following changes were made:

**Bug fixes:**

- Always check postfix "Contents/Home" on macOS by
[@&#8203;erwin1](https://togithub.com/erwin1) in
[actions/setup-java#397
- Fix sbt/scala cache key by
[@&#8203;Dogacel](https://togithub.com/Dogacel) in
[actions/setup-java#478
- Corretto toolcache folder name fix by
[@&#8203;IvanZosimov](https://togithub.com/IvanZosimov) in
[actions/setup-java#480
- Update versions of Oracle JDK and Microsoft Build of OpenJDK by
[@&#8203;anishi1222](https://togithub.com/anishi1222) in
[actions/setup-java#489
- Update Oracle JDK download URL calculation by
[@&#8203;nikolai-laevskii](https://togithub.com/nikolai-laevskii) in
[actions/setup-java#507

**Feature implementations:**

- Add versions properties to cache by
[@&#8203;Endi327](https://togithub.com/Endi327) in
[actions/setup-java#280

**Resolving dependencies issues:**

- Remove implicit dependencies by
[@&#8203;nikolai-laevskii](https://togithub.com/nikolai-laevskii) in
[actions/setup-java#494
- Update xml2js by
[@&#8203;dmitry-shibanov](https://togithub.com/dmitry-shibanov) in
[actions/setup-java#484
- Update dependencies by
[@&#8203;IvanZosimov](https://togithub.com/IvanZosimov) in
[actions/setup-java#511

**Infrastructure updates:**

- Fix glob bug in package.json scripts section by
[@&#8203;IvanZosimov](https://togithub.com/IvanZosimov) in
[actions/setup-java#475
- Update mocks by
[@&#8203;nikolai-laevskii](https://togithub.com/nikolai-laevskii) in
[actions/setup-java#498

**Documentation changes:**

- Instruction to download custom distribution JDK and install by
[@&#8203;ragsmpl](https://togithub.com/ragsmpl) in
[actions/setup-java#500

#### New Contributors

- [@&#8203;erwin1](https://togithub.com/erwin1) made their first
contribution in
[actions/setup-java#397
- [@&#8203;Dogacel](https://togithub.com/Dogacel) made their first
contribution in
[actions/setup-java#478
- [@&#8203;anishi1222](https://togithub.com/anishi1222) made their first
contribution in
[actions/setup-java#489
- [@&#8203;nikolai-laevskii](https://togithub.com/nikolai-laevskii) made
their first contribution in
[actions/setup-java#498
- [@&#8203;ragsmpl](https://togithub.com/ragsmpl) made their first
contribution in
[actions/setup-java#500
- [@&#8203;Endi327](https://togithub.com/Endi327) made their first
contribution in
[actions/setup-java#280

**Full Changelog**:
actions/setup-java@v3...v3.12.0

</details>

<details>
<summary>github/codeql-action (github/codeql-action)</summary>

###
[`v2.21.2`](https://togithub.com/github/codeql-action/compare/v2.21.1...v2.21.2)

[Compare
Source](https://togithub.com/github/codeql-action/compare/v2.21.1...v2.21.2)

###
[`v2.21.1`](https://togithub.com/github/codeql-action/compare/v2.21.0...v2.21.1)

[Compare
Source](https://togithub.com/github/codeql-action/compare/v2.21.0...v2.21.1)

</details>

<details>
<summary>gradle/gradle-build-action
(gradle/gradle-build-action)</summary>

###
[`v2.7.0`](https://togithub.com/gradle/gradle-build-action/releases/tag/v2.7.0)

[Compare
Source](https://togithub.com/gradle/gradle-build-action/compare/v2.6.1...v2.7.0)

##### GitHub Dependency Graph support

In this release, the GitHub Dependency Graph support is no longer
considered "experimental", and should be considered ready for production
use. You can read more about the Dependency Graph support in [the README
chapter](https://togithub.com/gradle/gradle-build-action#github-dependency-graph-support).

##### Changes

- Update to
[`github-dependency-graph-gradle-plugin@v0.2.0`](https://plugins.gradle.org/plugin/org.gradle.github-dependency-graph-gradle-plugin/0.2.0)
- Dependency graph uses Gradle Settings file as manifest location (if
Settings file exists)
- Adds a `dependency-graph-file` output to any step that generates a
Dependency Graph file

##### Changelog

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "every weekend" (UTC), Automerge - At
any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/slsa-framework/slsa-github-generator).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4yNC4yIiwidXBkYXRlZEluVmVyIjoiMzYuMjQuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

---------

Signed-off-by: Mend Renovate <bot@renovateapp.com>
Signed-off-by: Ian Lewis <ianlewis@google.com>
Co-authored-by: Ian Lewis <ianlewis@google.com>
enteraga6 pushed a commit to enteraga6/slsa-github-generator that referenced this pull request Aug 8, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| actions/setup-java | action | digest | `cd89f46` -> `b943a4e` |
| [actions/setup-java](https://togithub.com/actions/setup-java) | action
| minor | `v3.11.0` -> `v3.12.0` |
| [actions/setup-java](https://togithub.com/actions/setup-java) | action
| digest | `5ffc13f` -> `cd89f46` |
| [github/codeql-action](https://togithub.com/github/codeql-action) |
action | patch | `v2.21.0` -> `v2.21.2` |
|
[gradle/gradle-build-action](https://togithub.com/gradle/gradle-build-action)
| action | minor | `v2.6.1` -> `v2.7.0` |

---

### ⚠ Dependency Lookup Warnings ⚠

Warnings were logged while processing this repo. Please check the
Dependency Dashboard for more information.

---

### Release Notes

<details>
<summary>actions/setup-java (actions/setup-java)</summary>

###
[`v3.12.0`](https://togithub.com/actions/setup-java/releases/tag/v3.12.0)

[Compare
Source](https://togithub.com/actions/setup-java/compare/v3.11.0...v3.12.0)

In scope of this release the following changes were made:

**Bug fixes:**

- Always check postfix "Contents/Home" on macOS by
[@&#8203;erwin1](https://togithub.com/erwin1) in
[actions/setup-java#397
- Fix sbt/scala cache key by
[@&#8203;Dogacel](https://togithub.com/Dogacel) in
[actions/setup-java#478
- Corretto toolcache folder name fix by
[@&#8203;IvanZosimov](https://togithub.com/IvanZosimov) in
[actions/setup-java#480
- Update versions of Oracle JDK and Microsoft Build of OpenJDK by
[@&#8203;anishi1222](https://togithub.com/anishi1222) in
[actions/setup-java#489
- Update Oracle JDK download URL calculation by
[@&#8203;nikolai-laevskii](https://togithub.com/nikolai-laevskii) in
[actions/setup-java#507

**Feature implementations:**

- Add versions properties to cache by
[@&#8203;Endi327](https://togithub.com/Endi327) in
[actions/setup-java#280

**Resolving dependencies issues:**

- Remove implicit dependencies by
[@&#8203;nikolai-laevskii](https://togithub.com/nikolai-laevskii) in
[actions/setup-java#494
- Update xml2js by
[@&#8203;dmitry-shibanov](https://togithub.com/dmitry-shibanov) in
[actions/setup-java#484
- Update dependencies by
[@&#8203;IvanZosimov](https://togithub.com/IvanZosimov) in
[actions/setup-java#511

**Infrastructure updates:**

- Fix glob bug in package.json scripts section by
[@&#8203;IvanZosimov](https://togithub.com/IvanZosimov) in
[actions/setup-java#475
- Update mocks by
[@&#8203;nikolai-laevskii](https://togithub.com/nikolai-laevskii) in
[actions/setup-java#498

**Documentation changes:**

- Instruction to download custom distribution JDK and install by
[@&#8203;ragsmpl](https://togithub.com/ragsmpl) in
[actions/setup-java#500

#### New Contributors

- [@&#8203;erwin1](https://togithub.com/erwin1) made their first
contribution in
[actions/setup-java#397
- [@&#8203;Dogacel](https://togithub.com/Dogacel) made their first
contribution in
[actions/setup-java#478
- [@&#8203;anishi1222](https://togithub.com/anishi1222) made their first
contribution in
[actions/setup-java#489
- [@&#8203;nikolai-laevskii](https://togithub.com/nikolai-laevskii) made
their first contribution in
[actions/setup-java#498
- [@&#8203;ragsmpl](https://togithub.com/ragsmpl) made their first
contribution in
[actions/setup-java#500
- [@&#8203;Endi327](https://togithub.com/Endi327) made their first
contribution in
[actions/setup-java#280

**Full Changelog**:
actions/setup-java@v3...v3.12.0

</details>

<details>
<summary>github/codeql-action (github/codeql-action)</summary>

###
[`v2.21.2`](https://togithub.com/github/codeql-action/compare/v2.21.1...v2.21.2)

[Compare
Source](https://togithub.com/github/codeql-action/compare/v2.21.1...v2.21.2)

###
[`v2.21.1`](https://togithub.com/github/codeql-action/compare/v2.21.0...v2.21.1)

[Compare
Source](https://togithub.com/github/codeql-action/compare/v2.21.0...v2.21.1)

</details>

<details>
<summary>gradle/gradle-build-action
(gradle/gradle-build-action)</summary>

###
[`v2.7.0`](https://togithub.com/gradle/gradle-build-action/releases/tag/v2.7.0)

[Compare
Source](https://togithub.com/gradle/gradle-build-action/compare/v2.6.1...v2.7.0)

##### GitHub Dependency Graph support

In this release, the GitHub Dependency Graph support is no longer
considered "experimental", and should be considered ready for production
use. You can read more about the Dependency Graph support in [the README
chapter](https://togithub.com/gradle/gradle-build-action#github-dependency-graph-support).

##### Changes

- Update to
[`github-dependency-graph-gradle-plugin@v0.2.0`](https://plugins.gradle.org/plugin/org.gradle.github-dependency-graph-gradle-plugin/0.2.0)
- Dependency graph uses Gradle Settings file as manifest location (if
Settings file exists)
- Adds a `dependency-graph-file` output to any step that generates a
Dependency Graph file

##### Changelog

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "every weekend" (UTC), Automerge - At
any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/slsa-framework/slsa-github-generator).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4yNC4yIiwidXBkYXRlZEluVmVyIjoiMzYuMjQuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

---------

Signed-off-by: Mend Renovate <bot@renovateapp.com>
Signed-off-by: Ian Lewis <ianlewis@google.com>
Co-authored-by: Ian Lewis <ianlewis@google.com>
Signed-off-by: Noah Elzner <elzner@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants