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

[macos ci] update 2021-07-27 #19207

Merged
merged 11 commits into from
Aug 4, 2021

Conversation

strega-nil
Copy link
Contributor

macOS -> 11.5.1, XCode -> 12.5.1

Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

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

Have we squirreled away the oldest accessible base OS image so we can repro issues in the future?

@strega-nil-ms
Copy link
Contributor

strega-nil-ms commented Jul 28, 2021

@ras0219-msft yep - we have 11.2 and 10.15 squirreled away

@strega-nil-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JackBoosY JackBoosY added category:infrastructure Pertaining to the CI/Testing infrastrucutre info:internal This PR or Issue was filed by the vcpkg team. labels Jul 29, 2021
@strega-nil-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

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 selene but no changes to version or port version.
-- Version: 0.3.1#4
-- Old SHA: 414a898c6d7a263608c56e4bdddfc69936a6b9d7
-- New SHA: 4def7156214c694075962a6119a35d2c359a0c64
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for azure-iot-sdk-c but no changes to version or port version.
-- Version: 2020-12-09#1
-- Old SHA: 5dadcecafd0c3ffdfcf438c1f5f8b106002e14d0
-- New SHA: e483305a4b34824282fd8d5e0351c750f0881a53
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for coroutine but no changes to version or port version.
-- Version: 1.5.0#1
-- Old SHA: da458b763cbbbbba0acf20b1895ddd4ee4ff8d0b
-- New SHA: 8ed1fa9c521d57b151bb3dafc261daa7b07564b4
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for libunistring but no changes to version or port version.
-- Version: 0.9.10
-- Old SHA: 586bf47f6b9ee55aa3eb9ec7c7ff36363e39980b
-- New SHA: a5119a939a7cc06cbe1b04ac948cd8d0cf2ea276
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for nanodbc but no changes to version or port version.
-- Version: 2.13.0#3
-- Old SHA: 2c22ba3957ee9a1a2c6d893c746b6a51bf38435c
-- New SHA: d7c0d20a188f550734f1ba39ee5df96f9199e9dd
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for xlnt but no changes to version or port version.
-- Version: 1.5.0#1
-- Old SHA: 1e9127d56c2d772d64454b5aef80f93689f70242
-- New SHA: 22b0f9eb48e9a5b7b30120b51b70830dbed70097
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for libodb but no changes to version or port version.
-- Version: 2.4.0#7
-- Old SHA: 6be9a8547e11c2b30077c90504c6dc714f854076
-- New SHA: 9014172217500cac62b80dadbb9362e5e4b6fc6c
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for itpp but no changes to version or port version.
-- Version: 4.3.1#6
-- Old SHA: ef6b3ce5f6b2522df8dc27959244a73581a44b6d
-- New SHA: 06937e312a9878f434f9ab236a65343b600e778c
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for sentencepiece but no changes to version or port version.
-- Version: v0.1.82
-- Old SHA: 90b2ef495290ecbf5894d437a1d03d3735d9bf4d
-- New SHA: a9ba7718b7eb8bd1b89199b6505a44ec92d7706f
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@strega-nil-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil-ms strega-nil-ms force-pushed the macos-2021-07-27 branch 3 times, most recently from 93b641a to e92ca1b Compare August 3, 2021 01:05
AC_CONFIG_AUX_DIR([build-aux])
. $srcdir/version.sh
-gl_INIT_PACKAGE([libunistring], [$VERSION_NUMBER])
+#gl_INIT_PACKAGE([libunistring], [$VERSION_NUMBER])
Copy link
Contributor

Choose a reason for hiding this comment

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

Please take a look at this @ras0219

Copy link
Contributor

@ras0219-msft ras0219-msft Aug 3, 2021

Choose a reason for hiding this comment

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

This looks like a patch that will break on next update -- instead, I think it would make sense to expect an environment variable in AC_INIT:

AC_INIT([libunistring], [$UNISTRING_VERSION])

which we can then set in the portfile as set(ENV{UNISTRING_VERSION} <version>), I believe.

Copy link
Contributor

Choose a reason for hiding this comment

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

(Also, more info about gl_INIT_PACKAGE here: https://lists.gnu.org/archive/html/automake/2009-05/msg00145.html)

Copy link
Contributor

Choose a reason for hiding this comment

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

okay I've fixed this for real. I now know way, way too much about autoconf.

scripts/cmake/vcpkg_from_git.cmake Outdated Show resolved Hide resolved
@strega-nil-ms
Copy link
Contributor

I'll put the tinydialog fix into another PR, in order to avoid rebuilding the world.

ports/plplot/CONTROL Outdated Show resolved Hide resolved
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 a863c84812089836a3c0f2f215ab3e2579fc8acf -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/l-/libunistring.json b/versions/l-/libunistring.json
index b67592f..3651b41 100644
--- a/versions/l-/libunistring.json
+++ b/versions/l-/libunistring.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "230a240908341f39e559b98bf1657190d0505756",
+      "git-tree": "7e74b9d781041b3a5c09b72f77b8e79ea6add168",
       "version": "0.9.10",
       "port-version": 1
     },

@strega-nil-ms strega-nil-ms merged commit ff190a5 into microsoft:master Aug 4, 2021
Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Aug 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:infrastructure Pertaining to the CI/Testing infrastrucutre info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants