Skip to content

Conversation

@zzambers
Copy link
Contributor

@zzambers zzambers commented Sep 7, 2023

This backport switches to pandoc for coversion of building readme to html. It also does some style/formating changes/fixes to building readme, which is moved to new location and also removes redundant information in other Readme files.

Backport is not clear. Code for coversion to html had to be modified to work with JDK8 build system. Change set (patch) for building readme mostly applied automatically, but some parts had to be done by hand due to few differences.

Unlike in original change set, this backport moves README-builds.{md,html} files directly to doc/building.{md,html} and not to intermediate location common/doc/building.{md,html}. (additional move was done in jdk10 as part of JDK-8187443)


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
  • JDK-8176509 needs maintainer approval

Issue

  • JDK-8176509: Use pandoc for converting build readme to html (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 370

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 7, 2023

👋 Welcome back zzambers! 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 9d0bd1b495012de5de1c62f65f14c4de36aef056 8176509: Use pandoc for converting build readme to html Sep 7, 2023
@openjdk
Copy link

openjdk bot commented Sep 7, 2023

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Sep 7, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 7, 2023

Webrevs

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 6, 2023

@zzambers This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 3, 2023

@zzambers This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

@bridgekeeper bridgekeeper bot closed this Nov 3, 2023
@zzambers
Copy link
Contributor Author

zzambers commented Nov 6, 2023

/open

@openjdk openjdk bot reopened this Nov 6, 2023
@openjdk
Copy link

openjdk bot commented Nov 6, 2023

@zzambers This pull request is now open

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Looks good to me. 8u build requirements seem to have been retained as is and I think moving the file to the final place here is the right thing to do.

@openjdk
Copy link

openjdk bot commented Nov 11, 2023

⚠️ @zzambers This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@zzambers
Copy link
Contributor Author

/approval request Backport switches to pandoc for builds readme html generation (+ does some docs fixes), GHA tests ok

@openjdk
Copy link

openjdk bot commented Nov 13, 2023

@zzambers
8176509: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Nov 13, 2023
@zzambers
Copy link
Contributor Author

zzambers commented Nov 13, 2023

Looks good to me. 8u build requirements seem to have been retained as is and I think moving the file to the final place here is the right thing to do.

Yy, pandoc should be optional, it builds without it in GHA.

Unfortunately there is little additional noise in generated-configure.sh's diff concerning --runstatedir option, even though, I have used same version of autofonf, as was used before (2.69). It boils down to whether autoconf is ran on distro which has specific backport. (Not present on rhel-8 I used) But I don't think this affects OpenJDK in any way.

@gnu-andrew
Copy link
Member

Looks good to me. 8u build requirements seem to have been retained as is and I think moving the file to the final place here is the right thing to do.

Yy, pandoc should be optional, it builds without it in GHA.

Unfortunately there is little additional noise in generated-configure.sh's diff concerning --runstatedir option, even though, I have used same version of autofonf, as was used before (2.69). It boils down to whether autoconf is ran on distro which has specific backport. (Not present on rhel-8 I used) But I don't think this affects OpenJDK in any way.

No, it shouldn't and one can always regenerate configure if it is an issue. I'm in two minds about whether it is finally time to backport JDK-8195689 to 8u and get rid of this once and for all. It is the only JDK to have this baggage (it is removed in 11u and up) and I think it causes more problems than it solves, but then I've never been a fan of bundling generated files to begin with.

@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Nov 13, 2023

@gnu-andrew
8176509: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Nov 13, 2023

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

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

8176509: Use pandoc for converting build readme to html

Reviewed-by: andrew

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 38 new commits pushed to 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 ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Nov 13, 2023
@zzambers
Copy link
Contributor Author

@gnu-andrew thanks
/integrate

@openjdk
Copy link

openjdk bot commented Nov 14, 2023

Going to push as commit 10a653e.
Since your change was applied there have been 38 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 14, 2023

@zzambers Pushed as commit 10a653e.

💡 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 Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants