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

8284539: Configure --with-source-date=version fails on MacOS #8247

Closed
wants to merge 1 commit into from

Conversation

andrew-m-leonard
Copy link

@andrew-m-leonard andrew-m-leonard commented Apr 14, 2022

JDK-8282769 added support for more ISO-8601 formats, but remove handling of just a date "YYYY-MM-DD" being present, which is the case for a configure using --with-source-date=version which uses the date string from version-numbers.conf.
Also, the first date parse had an invalid format string "%FZ %TZ", with too many Zs.
This PR corrects the first date parse to parse a standard ISO-8601 Zulu date&time: "%FT%TZ"
Then it adds the final check for no time being specified.

Signed-off-by: Andrew Leonard anleonar@redhat.com


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8284539: Configure --with-source-date=version fails on MacOS

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8247/head:pull/8247
$ git checkout pull/8247

Update a local copy of the PR:
$ git checkout pull/8247
$ git pull https://git.openjdk.java.net/jdk pull/8247/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8247

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8247.diff

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 14, 2022

👋 Welcome back aleonard! 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 added the rfr Pull request is ready for review label Apr 14, 2022
@andrew-m-leonard
Copy link
Author

Verified formatting on MacOS:
1st parse:

% date -u -j -f "%FT%TZ" "2022-09-22T12:56:04Z" "+%s"               
1663851364

2nd parse trimming milli-seconds:

% date -u -j -f "%Y-%m-%dT%H:%M:%S" "2022-09-22T12:56:04.456Z" "+%s"             
Warning: Ignoring 5 extraneous characters in date string (.456Z)
1663851364

3rd parse with T00:00:00Z time added:

% date -u -j -f "%FT%TZ" "2022-09-22T00:00:00Z" "+%s"               
1663804800

@openjdk
Copy link

openjdk bot commented Apr 14, 2022

@andrew-m-leonard The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Apr 14, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 14, 2022

Webrevs

@andrew-m-leonard
Copy link
Author

@magicus Hi Magnus, when you get a moment can you take a look at this one please? cheers

@openjdk
Copy link

openjdk bot commented Apr 15, 2022

@andrew-m-leonard 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:

8284539: Configure --with-source-date=version fails on MacOS

Reviewed-by: erikj, ihse

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:

  • 8d96ab0: 8280761: UseCompressedOops should be set after limit_heap_by_allocatable_memory
  • b9f513c: 8283790: G1: Remove redundant card/heap-address transition
  • 647aa2a: 8284572: Remove unneeded null check in ReferenceProcessor::discover_reference
  • ab83bce: 8284661: Reproducible assembly builds without relative linking
  • c5e9719: 8266246: Swing test PressedIconTest.java sometimes fails on macOS 11 ARM
  • 447c2d1: 8284521: Write an automated regression test for RFE 4371575
  • 145dfed: 8284937: riscv: should not allocate special register for temp
  • 87faa85: 8186958: Need method to create pre-sized HashMap
  • 41fc078: 8284112: Minor cleanup could be done in javax.crypto
  • 897d6c0: 8282008: Incorrect handling of quoted arguments in ProcessBuilder
  • ... and 28 more: https://git.openjdk.java.net/jdk/compare/3ffec3a50b70051eba3fc7cd816e49811870f5d4...master

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 Apr 15, 2022
@andrew-m-leonard
Copy link
Author

@magicus let me know when you're good for this one? and i'll then integrate

@andrew-m-leonard
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 19, 2022

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

  • ac77b63: 8284725: Fix include guard in jfrbitset.hpp
  • 595c8b8: 8284999: Remove remaining files in src/samples
  • 8d96ab0: 8280761: UseCompressedOops should be set after limit_heap_by_allocatable_memory
  • b9f513c: 8283790: G1: Remove redundant card/heap-address transition
  • 647aa2a: 8284572: Remove unneeded null check in ReferenceProcessor::discover_reference
  • ab83bce: 8284661: Reproducible assembly builds without relative linking
  • c5e9719: 8266246: Swing test PressedIconTest.java sometimes fails on macOS 11 ARM
  • 447c2d1: 8284521: Write an automated regression test for RFE 4371575
  • 145dfed: 8284937: riscv: should not allocate special register for temp
  • 87faa85: 8186958: Need method to create pre-sized HashMap
  • ... and 30 more: https://git.openjdk.java.net/jdk/compare/3ffec3a50b70051eba3fc7cd816e49811870f5d4...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 19, 2022

@andrew-m-leonard Pushed as commit da3d8b1.

💡 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
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants