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

dependabot: bump actions/setup-java from 1 to 3 #3142

Merged
merged 2 commits into from
Aug 16, 2023

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Aug 10, 2023

Bumps actions/setup-java from 1 to 3.

Release notes

Sourced from actions/setup-java's releases.

v3.0.0

In scope of this release we changed version of the runtime Node.js for the setup-java action and updated package-lock.json file to v2.

Breaking Changes

With the update to Node 16 in #290, all scripts will now be run with Node 16 rather than Node 12.

v2.5.1

In scope of this release we updated actions/core to 1.10.0 for v2 major tag: actions/setup-java#466

v2.5.0

In scope of this pull request we add support for Microsoft Build of OpenJDK (actions/setup-java#252).

steps:
  - name: Checkout
    uses: actions/checkout@v2
  - name: Setup-java
    uses: actions/setup-java@v2
    with:
      distribution: microsoft
      java-version: 11

Supported distributions

Currently, the following distributions are supported:

Keyword Distribution Official site License
temurin Eclipse Temurin Link Link
zulu Zulu OpenJDK Link Link
adopt or adopt-hotspot Adopt OpenJDK Hotspot Link Link
adopt-openj9 Adopt OpenJDK OpenJ9 Link Link
liberica Liberica JDK Link Link
microsoft Microsoft Build of OpenJDK Link Link

v2.4.0

In scope of this pull request we add support for Liberica JDK (actions/setup-java#225).

steps:
  - name: Checkout
    uses: actions/checkout@v2
  - name: Setup-java
    uses: actions/setup-java@v2
    with:
      distribution: liberica
      java-version: 11

Supported distributions

Currently, the following distributions are supported:

Keyword Distribution Official site License
zulu Zulu OpenJDK Link Link

... (truncated)

Commits
  • cd89f46 Add versions properties to cache (#280)
  • 4fb3975 Merge pull request #507 from akv-platform/update-oracle-jdk-url-calculation
  • 33b10b6 Use archive as fallback only when dealing with major version
  • 75c6561 Update dependencies (#511)
  • ebe05e0 Update build
  • 46099e1 Build
  • 1a3cd38 Update Oracle JDK URL calculation
  • 1f2faad Instruction to download custom distribution JDK and install (#500)
  • 45058d7 Update xml2js (#484)
  • 87c1c70 Merge pull request #494 from akv-platform/remove-implicit-dependencies
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file github_actions Pull requests that update GitHub Actions code labels Aug 10, 2023
@codecov
Copy link

codecov bot commented Aug 10, 2023

Codecov Report

Merging #3142 (d4c4807) into main (0b89858) will increase coverage by 0.02%.
Report is 2 commits behind head on main.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #3142      +/-   ##
============================================
+ Coverage     62.43%   62.45%   +0.02%     
+ Complexity     3353     3352       -1     
============================================
  Files           254      254              
  Lines         19749    19749              
  Branches       3334     3334              
============================================
+ Hits          12331    12335       +4     
+ Misses         5789     5785       -4     
  Partials       1629     1629              

see 2 files with indirect coverage changes

reta
reta previously approved these changes Aug 10, 2023
Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

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

Several usages need to specific the distribution used, distribution: temurin

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 1 to 3.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v1...v3)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot force-pushed the dependabot/github_actions/actions/setup-java-3 branch from 07bbc66 to 3e4f650 Compare August 15, 2023 13:38
Signed-off-by: Peter Nied <petern@amazon.com>
@peternied peternied merged commit 7e33bf3 into main Aug 16, 2023
@peternied peternied deleted the dependabot/github_actions/actions/setup-java-3 branch August 16, 2023 20:36
@peternied peternied added the backport 2.x backport to 2.x branch label Aug 16, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-3142-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7e33bf3426ad1d8074cff4d9e147800f790c09be
# Push it to GitHub
git push --set-upstream origin backport/backport-3142-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-3142-to-2.x.

peternied added a commit that referenced this pull request Aug 16, 2023
Backport 7e33bf3 from #3142.

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 1
to 3.

Also removes unused workflows

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Nied <petern@amazon.com>
(cherry picked from commit 7e33bf3)
Signed-off-by: Peter Nied <petern@amazon.com>
willyborankin pushed a commit that referenced this pull request Aug 17, 2023
#3197)

### Description
Backport 7e33bf3 from #3142.

### Check List
- [ ] ~New functionality includes testing~
- [ ] ~New functionality has been documented~
- [X] Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and
signing off your commits, please check
[here](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch dependencies Pull requests that update a dependency file github_actions Pull requests that update GitHub Actions code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants