Skip to content

[clockutils] Fix x64-windows-static-md#23965

Merged
strega-nil-ms merged 6 commits intomicrosoft:masterfrom
Thomas1664:clockutils
Apr 8, 2022
Merged

[clockutils] Fix x64-windows-static-md#23965
strega-nil-ms merged 6 commits intomicrosoft:masterfrom
Thomas1664:clockutils

Conversation

@Thomas1664
Copy link
Copy Markdown
Contributor

@Thomas1664 Thomas1664 commented Apr 3, 2022

Describe the pull request

  • What does your PR fix?

    Note: still using version-string because of appended commit id

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    Removed from CI baseline; all

  • Does your PR follow the maintainer guide?

    Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    Yes

@Thomas1664 Thomas1664 closed this Apr 3, 2022
@Thomas1664 Thomas1664 reopened this Apr 3, 2022
@Cheney-W Cheney-W added the category:port-bug The issue is with a library, which is something the port should already support label Apr 6, 2022
@Cheney-W
Copy link
Copy Markdown
Contributor

Cheney-W commented Apr 6, 2022

For fixing the CI failure:
image
please use version instead of version-string in the vcpkg.json file.

@dg0yt
Copy link
Copy Markdown
Contributor

dg0yt commented Apr 6, 2022

AFAICT 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5 is not a valid version.
https://vcpkg.io/en/docs/users/versioning.html#version

@dg0yt
Copy link
Copy Markdown
Contributor

dg0yt commented Apr 6, 2022

I took the time to check upstream.
All what was added in the chosen REF over 1.1.1 is a particular cast:
ClockworkOrigins/clockUtils@1.1.1...master
From this background, I would suggest to use "version": "1.1.1", and just add a note to the REF in the portfile.
(Alternatively, actually use REF 1.1.1 and add this single change as a patch, for maximum transparency.)

@Thomas1664
Copy link
Copy Markdown
Contributor Author

Thomas1664 commented Apr 6, 2022

I took the time to check upstream. All what was added in the chosen REF over 1.1.1 is a particular cast: ClockworkOrigins/clockUtils@1.1.1...master From this background, I would suggest to use "version": "1.1.1", and just add a note to the REF in the portfile. (Alternatively, actually use REF 1.1.1 and add this single change as a patch, for maximum transparency.)

This is more of an opinion.

The practice is that if a port - especially if the repo wasn't updated for 5 years - to use version-date to point at the latest commit on master. I am pretty sure that the appended commit id broke the versioning scheme anyway. I would prefer patching if we expected a new release. I don't like the idea to use 1.1.1 because there already was a version 1.1.1. In this case I would need to update port-version which is incorrect as well.

@dg0yt
Copy link
Copy Markdown
Contributor

dg0yt commented Apr 6, 2022

I took the time to check upstream. All what was added in the chosen REF over 1.1.1 is a particular cast: ClockworkOrigins/clockUtils@1.1.1...master From this background, I would suggest to use "version": "1.1.1", and just add a note to the REF in the portfile. (Alternatively, actually use REF 1.1.1 and add this single change as a patch, for maximum transparency.)

This is more of an opinion.

Yes, this is my opinion. Of course there are also arguments:

  • Upstream version schemes are generally also adopted by other package repositories, and using the same scheme facilitates comparison, e.g. on repology.org.
  • Upstream versions are what consumers of our ports usually refer to.

The practice is that if a port - especially if the repo wasn't updated for 5 years - to use version-date to point at the latest commit on master.

IMO this is more another opinion than common practice. The differentiated version schemes don't exist for a long time. And very often, version-date refers to the date of the port change, not the upstream change.

I am pretty sure that the appended commit id broke the versioning scheme anyway. I would prefer patching if we expected a new release. I don't like the idea to use 1.1.1 because there already was a version 1.1.1. In this case I would need to update port-version which is incorrect as well.

If we don't expect a new version, we could just stay with version-string. It gives both the approximate version and the actual commit.

@Thomas1664
Copy link
Copy Markdown
Contributor Author

If we don't expect a new version, we could just stay with version-string. It gives both the approximate version and the actual commit.

This is what I want as well, but GH Actions doesn't like it.

@dg0yt
Copy link
Copy Markdown
Contributor

dg0yt commented Apr 6, 2022

If we don't expect a new version, we could just stay with version-string. It gives both the approximate version and the actual commit.

This is what I want as well, but GH Actions doesn't like it.

Yes, but the GH action didn't propose a change, it just failed with an error. Other port authors already went through version scheme ping-pong because of this. My initial comment was meant to save you from this pointless exercise.

@Cheney-W Cheney-W added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed requires:author-response labels Apr 7, 2022
@dg0yt
Copy link
Copy Markdown
Contributor

dg0yt commented Apr 7, 2022

GH Actions doesn't like it.

Cf. #24011 (comment)

Copy link
Copy Markdown
Contributor

@strega-nil-ms strega-nil-ms left a comment

Choose a reason for hiding this comment

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

I am very strongly of the opinion that this should be "version": "1.1.1" - this is clearly just 1.1.1 with a change from Alex, an old vcpkg maintainer.

@strega-nil-ms strega-nil-ms added requires:author-response and removed info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. labels Apr 7, 2022
@Cheney-W Cheney-W added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed requires:author-response labels Apr 8, 2022
@strega-nil-ms
Copy link
Copy Markdown
Contributor

Thanks!

@strega-nil-ms strega-nil-ms merged commit 6266585 into microsoft:master Apr 8, 2022
@Thomas1664 Thomas1664 deleted the clockutils branch April 9, 2022 06:28
ekilmer added a commit to ekilmer/vcpkg that referenced this pull request Apr 12, 2022
* master: (139 commits)
  [dstorage] Add port for Microsoft.Direct3D.DirectStorage NuGet (microsoft#24063)
  [vcpkg] Refactor toolchain & generator selection (microsoft#23846)
  [icu] update to 70.1 (microsoft#23445)
  [vcpkg] Update android usage documentation (microsoft#23690)
  [LMDB] update to 0.9.29 (microsoft#24045)
  [catch2] Don't install docs (microsoft#24046)
  [harfbuff] fix arm64 osx build (microsoft#24055)
  [openxr-loader] remove from CI baseline (microsoft#24057)
  [imath] Update to 3.1.5 (microsoft#24059)
  [openssl] Fix dynamic builds on UNIX (microsoft#24061)
  [c-ares] update to 1.18.1 (microsoft#24062)
  [igraph] update to 0.9.8 (microsoft#24065)
  [cmake-user] Fix library check (microsoft#24070)
  [openxr-loader] fix ci.baseline.txt (microsoft#24073)
  [tinycbor] Fix file conflicts with libcbor (microsoft#24056)
  [graphviz,libslirp] Limit msys to windows (microsoft#24032)
  [bdwgc] Don't build docs (microsoft#24025)
  [capstone] update to 5.0.0-rc2 (microsoft#23979)
  [clockutils] Fix x64-windows-static-md (microsoft#23965)
  [braft] New port (microsoft#23830)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-bug The issue is with a library, which is something the port should already support info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants