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

8310259: Pin msys2/setup-msys2 github action to a specific commit #1573

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jul 12, 2023

I backport this to work around an error of msys2

I ran into this testing the bump to jtreg 7.2.
This subsumes previous changes 8309934 and 8310183.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8310259: Pin msys2/setup-msys2 github action to a specific commit (Task - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1573/head:pull/1573
$ git checkout pull/1573

Update a local copy of the PR:
$ git checkout pull/1573
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1573/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1573

View PR using the GUI difftool:
$ git pr show -t 1573

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1573.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 12, 2023

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@GoeLin
Copy link
Member Author

GoeLin commented Jul 12, 2023

/issue add 8309934, 8310183

@openjdk openjdk bot changed the title Backport 959a61fdd483c9523764b9ba0972f59ca06db0ee 8310259: Pin msys2/setup-msys2 github action to a specific commit Jul 12, 2023
@openjdk
Copy link

openjdk bot commented Jul 12, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jul 12, 2023
@openjdk
Copy link

openjdk bot commented Jul 12, 2023

@GoeLin
Adding additional issue to issue list: 8309934: Update GitHub Actions to use JDK 17 for building jtreg.

Adding additional issue to issue list: 8310183: Update GitHub Actions to use boot JDK for building jtreg.

@mlbridge
Copy link

mlbridge bot commented Jul 12, 2023

Webrevs

We probably need jtreg 7 to build with 17.
@GoeLin GoeLin marked this pull request as draft July 12, 2023 12:50
@openjdk openjdk bot removed the rfr Pull request is ready for review label Jul 12, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jul 13, 2023

/issue remove 8309934, 8310183

@GoeLin
Copy link
Member Author

GoeLin commented Jul 13, 2023

I removed setting the Java version to 17.
Obviously 8309934 and 8310183 have been tries to fix this issue here, which then had been undone partially by this change.
But our current setup does not work with jdk17. There is unsupported applet stuff somewhere in the dependencies.
Anyways, the intention of this change is to work around the msys problem, and the remaining change does just this.

@openjdk
Copy link

openjdk bot commented Jul 13, 2023

@GoeLin
Removing additional issue from issue list: 8309934.

Removing additional issue from issue list: 8310183.

@GoeLin GoeLin marked this pull request as ready for review July 13, 2023 06:27
@GoeLin
Copy link
Member Author

GoeLin commented Jul 13, 2023

GHA tests had passed before I removed the copyright change.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 13, 2023
@openjdk
Copy link

openjdk bot commented Jul 13, 2023

@GoeLin This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8310259: Pin msys2/setup-msys2 github action to a specific commit

Reviewed-by: mbaesken

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 4 new commits pushed to the master branch:

  • 3006096: 8308192: Error in parsing replay file when staticfield is an array of single dimension
  • b0b79a9: 8301097: Update GHA XCode to 12.5.1
  • 310115a: 8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance
  • e61bb2e: 8267517: async logging for stdout and stderr

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 13, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jul 13, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jul 13, 2023

Going to push as commit 2b8c260.
Since your change was applied there have been 4 commits pushed to the master branch:

  • 3006096: 8308192: Error in parsing replay file when staticfield is an array of single dimension
  • b0b79a9: 8301097: Update GHA XCode to 12.5.1
  • 310115a: 8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance
  • e61bb2e: 8267517: async logging for stdout and stderr

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 13, 2023
@openjdk openjdk bot closed this Jul 13, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 13, 2023
@openjdk
Copy link

openjdk bot commented Jul 13, 2023

@GoeLin Pushed as commit 2b8c260.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@GoeLin GoeLin deleted the goetz_backport_8310259 branch July 13, 2023 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants