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

8268185: Update GitHub Actions for jtreg 6 #1239

Closed
wants to merge 3 commits into from
Closed

Conversation

gdams
Copy link
Member

@gdams gdams commented Jul 18, 2022

simple backport of JDK-8268185: Update GitHub Actions for jtreg 6 in preparation for the GitHub action rewrite backport.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1239

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 18, 2022

👋 Welcome back gdams! 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.

@openjdk openjdk bot changed the title Backport e27c4d463d920994b79b8163f063ad74f6ee5d59 8268185: Update GitHub Actions for jtreg 6 Jul 18, 2022
@openjdk
Copy link

openjdk bot commented Jul 18, 2022

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 18, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 18, 2022

Webrevs

@gdams gdams marked this pull request as draft July 19, 2022 08:13
@openjdk openjdk bot removed the rfr Pull request is ready for review label Jul 19, 2022
@gdams gdams mentioned this pull request Jul 19, 2022
3 tasks
@gdams gdams changed the base branch from master to pr/1241 July 28, 2022 08:41
@gdams gdams marked this pull request as ready for review July 28, 2022 08:41
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 28, 2022
@openjdk-notifier
Copy link

@gdams Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@gdams
Copy link
Member Author

gdams commented Jul 28, 2022

/label add clean

@openjdk
Copy link

openjdk bot commented Jul 28, 2022

@gdams
The label clean is not a valid label.
These labels are valid:

@gdams
Copy link
Member Author

gdams commented Jul 28, 2022

/clean

@openjdk
Copy link

openjdk bot commented Jul 28, 2022

@gdams Only OpenJDK Committers can use the /clean command

Copy link
Contributor

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

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

Should be clean, no idea why the bot doesn't recognize it.

@GoeLin
Copy link
Member

GoeLin commented Jul 28, 2022

Great. Let's see whether the tests are passing.

@GoeLin
Copy link
Member

GoeLin commented Jul 28, 2022

The backport is not clean because in
.github/workflows/submit.yml
The original calls 'sh', but jdk11u-dev calls 'bash'.

Also, the context in make/conf/test-dependencies
differs ( BOOT_JDK_VERSION=11 vs 16).

But the change looks good.

Please only use the /clean command if you
understood why the change is not clean.
Adaptions to Copyright, ProblemList and maybe
some whitespace differences allow to
use the command.
Any resolves in code require a review, also
such as the differences here.

I'll mark it reviewed in case the tests
complete green.

@gdams
Copy link
Member Author

gdams commented Jul 28, 2022

@GoeLin all tests pass

Copy link
Member

@GoeLin GoeLin left a comment

Choose a reason for hiding this comment

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

LGTM

@GoeLin
Copy link
Member

GoeLin commented Jul 28, 2022

After pushing the other change, you have to give the bots some minutes to resolve this one.
Sometimes they manage and you can integrate right away, sometimes you need to merge.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1241 to master July 28, 2022 12:31
@openjdk-notifier
Copy link

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout jtreg6
git fetch https://git.openjdk.org/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@gdams
Copy link
Member Author

gdams commented Jul 28, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jul 28, 2022

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

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

8268185: Update GitHub Actions for jtreg 6

Reviewed-by: clanger, goetz

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@RealCLanger, @GoeLin) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 28, 2022
@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 28, 2022
@openjdk
Copy link

openjdk bot commented Jul 28, 2022

@gdams
Your change (at version 179d522) is now ready to be sponsored by a Committer.

@openjdk openjdk bot removed the sponsor Pull request is ready to be sponsored label Jul 28, 2022
@gdams
Copy link
Member Author

gdams commented Jul 28, 2022

@GoeLin / @RealCLanger looks like the rebase requires a new review...

@gdams
Copy link
Member Author

gdams commented Jul 28, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 28, 2022
@openjdk
Copy link

openjdk bot commented Jul 28, 2022

@gdams
Your change (at version 493b8b1) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 28, 2022

Going to push as commit 3c33047.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 28, 2022
@openjdk openjdk bot closed this Jul 28, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 28, 2022
@gdams gdams deleted the jtreg6 branch July 28, 2022 13:13
@openjdk openjdk bot removed the sponsor Pull request is ready to be sponsored label Jul 28, 2022
@openjdk
Copy link

openjdk bot commented Jul 28, 2022

@RealCLanger @gdams Pushed as commit 3c33047.

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

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
3 participants