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

[Tracy] Fixing issue where version 0.7.8 was pulling the wrong version #23061

Merged
merged 42 commits into from
Feb 23, 2022

Conversation

Honeybunch
Copy link
Contributor

Bringing the tracy patch inline with upstream: wolfpld/tracy#326

  • What does your PR fix?

Makes it so that the TracyClient target is under the Tracy namespace

  • Which triplets are supported/not supported? Have you updated the 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

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for tracy but no changes to version or port version.
-- Version: 0.7.8#1
-- Old SHA: 3995e035cf62c81d54be47133d37eb3073a44343
-- New SHA: 5a0b6438a4e9e436ffff59a26cefb7cfd95cf625
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for tracy but no changes to version or port version.
-- Version: 0.7.8#1
-- Old SHA: 3995e035cf62c81d54be47133d37eb3073a44343
-- New SHA: 5adae67d38124b86db46f0d2d9a749edec82221a
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 84e1600ba1bf6a1c61f28632723e469107c955fe -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json
index 71d36505..a371fec5 100644
--- a/versions/t-/tracy.json
+++ b/versions/t-/tracy.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "5adae67d38124b86db46f0d2d9a749edec82221a",
+      "git-tree": "3995e035cf62c81d54be47133d37eb3073a44343",
       "version": "0.7.8",
       "port-version": 1
     },

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for tracy but no changes to version or port version.
-- Version: 0.7.8#1
-- Old SHA: 3995e035cf62c81d54be47133d37eb3073a44343
-- New SHA: 54952533c95d7d693c896083d016250058b352c4
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 84e1600ba1bf6a1c61f28632723e469107c955fe -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json
index f5b565d9..a371fec5 100644
--- a/versions/t-/tracy.json
+++ b/versions/t-/tracy.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "54952533c95d7d693c896083d016250058b352c4",
+      "git-tree": "3995e035cf62c81d54be47133d37eb3073a44343",
       "version": "0.7.8",
       "port-version": 1
     },

@Honeybunch Honeybunch marked this pull request as ready for review February 12, 2022 02:30
@Honeybunch
Copy link
Contributor Author

Seems like CI crashed? I tested x86 locally and that built but the report from Azure is that vcpkg crashed

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 84e1600ba1bf6a1c61f28632723e469107c955fe -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json
index d6d15a42..e62acc16 100644
--- a/versions/t-/tracy.json
+++ b/versions/t-/tracy.json
@@ -1,12 +1,12 @@
 {
   "versions": [
     {
-      "git-tree": "b63ac8b588bc7e3a2d4cd70094c42cfb7d164ff4",
+      "git-tree": "cd1c100eb9ddde75c20e635bde4b177de0748785",
       "version": "0.7.8",
       "port-version": 2
     },
     {
-      "git-tree": "54952533c95d7d693c896083d016250058b352c4",
+      "git-tree": "3995e035cf62c81d54be47133d37eb3073a44343",
       "version": "0.7.8",
       "port-version": 1
     },

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/tracy/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/tracy/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/tracy/vcpkg.json

Valid values for the license field can be found in the documentation

@Honeybunch
Copy link
Contributor Author

Just pushed some changes after realizing I had messed up big time. The version of tracy here is 0.7.8 but the actual code ref being pulled here was a little bit ahead of that. So if you went and downloaded the tracy profiler at version 0.7.8 and tried to profile an application built with the 0.7.8 version here in vcpkg you wouldn't be able to attach the profiler. Had to update the ref in the portfile and redo the patch but it works now

@Honeybunch Honeybunch changed the title Putting Tracy targets in the Tracy namespace [Tracy] Fixing issue where version 0.7.8 was pulling the wrong version Feb 13, 2022
@JonLiu1993 JonLiu1993 self-assigned this Feb 14, 2022
@JonLiu1993 JonLiu1993 added category:port-bug The issue is with a library, which is something the port should already support requires:author-response labels Feb 14, 2022
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Feb 23, 2022
@vicroms vicroms merged commit 7249fa4 into microsoft:master Feb 23, 2022
ekilmer added a commit to ekilmer/vcpkg that referenced this pull request Feb 27, 2022
* master: (57 commits)
  [vcpkg-tools] update cmake and git (windows only) (microsoft#22985)
  Update vcpkg tool to 2022-02-24. (microsoft#23162)
  [vcpkg baseline] Move cspice headers (microsoft#23272)
  Fixed inaccurate Chinese words (microsoft#23179)
  [vcpkg] Add fixed changelog generator. (microsoft#23255)
  [authentication.md] Add Jenkins section (microsoft#23226)
  [vcpkg] Meson osx sysroot (microsoft#21772)
  [pkgconf] enable search for system libs on linux (microsoft#23010)
  [yasm/yasm-tool] Incorporate yasm-tool into yasm (microsoft#23218)
  [lapack-reference] Update to 3.10 (microsoft#23228)
  [skia] Arm64 for skia on osx (microsoft#23222)
  [libfido2] Update to 1.10.0 (microsoft#23241)
  [Tracy] Fixing issue where version 0.7.8 was pulling the wrong version (microsoft#23061)
  [libgpiod] Add new port. (microsoft#23221)
  [drogon] Update to 1.7.5 (microsoft#23227)
  [tinyexif] Remove from fail list. (microsoft#23163)
  [vcpkg docs][ES] Sync with English readme (microsoft#19834) (microsoft#22618)
  [vcpkg baseline][libao] Disable dlfcn check under windows (microsoft#23235)
  [OpenCV] upgrade to v4.5.5 (microsoft#22801)
  [libcurl-simple-https] New port (microsoft#22917)
  ...
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:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants