Skip to content

Update VMs for June Patch Tuesday#25260

Merged
BillyONeal merged 6 commits intomicrosoft:masterfrom
BillyONeal:vm-update
Jun 23, 2022
Merged

Update VMs for June Patch Tuesday#25260
BillyONeal merged 6 commits intomicrosoft:masterfrom
BillyONeal:vm-update

Conversation

@BillyONeal
Copy link
Copy Markdown
Member

No description provided.

@BillyONeal BillyONeal added info:internal category:infrastructure Pertaining to the CI/Testing infrastrucutre labels Jun 15, 2022
@BillyONeal BillyONeal marked this pull request as ready for review June 15, 2022 22:12
@BillyONeal
Copy link
Copy Markdown
Member Author

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@BillyONeal
Copy link
Copy Markdown
Member Author

Copy link
Copy Markdown

@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 3d8f78171a2a37d461077bf8d063256b63e25a4f -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 690e976..99a63e1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5166,7 +5166,7 @@
     },
     "opengl": {
       "baseline": "2022-03-14",
-      "port-version": 0
+      "port-version": 1
     },
     "opengl-registry": {
       "baseline": "2021-11-17",
diff --git a/versions/o-/opengl.json b/versions/o-/opengl.json
index f2e28fb..7440557 100644
--- a/versions/o-/opengl.json
+++ b/versions/o-/opengl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1d426861c143d72a6015b055a28462b3434df011",
+      "version-date": "2022-03-14",
+      "port-version": 1
+    },
     {
       "git-tree": "6778094e7a9e5027545a46af473d27ce28890c53",
       "version-date": "2022-03-14",

You have modified or added at least one vcpkg.json where you should check the license field.

Details

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

  • ports/opengl/vcpkg.json

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

@BillyONeal
Copy link
Copy Markdown
Member Author

Reran another full rebuild due to the opengl crash on arm64: https://dev.azure.com/vcpkg/public/_build/results?buildId=73949&view=results

BillyONeal added a commit to BillyONeal/vcpkg-tool that referenced this pull request Jun 22, 2022
This was discovered in attempting to update the Windows SDK in microsoft/vcpkg#25260 ; this Windows SDK has arm64x libraries that contain both arm64 and arm64ec architecture code.
@JackBoosY
Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

BillyONeal added a commit to microsoft/vcpkg-tool that referenced this pull request Jun 23, 2022
…599)

This was discovered in attempting to update the Windows SDK in microsoft/vcpkg#25260 ; this Windows SDK has arm64x libraries that contain both arm64 and arm64ec architecture code.
@JackBoosY
Copy link
Copy Markdown
Contributor

Seems like our pipeline stucked?

@BillyONeal
Copy link
Copy Markdown
Member Author

Seems like our pipeline stucked?

Looks like it did the correct thing to me?

…e-pipelines/../ci.baseline.txt).

PASSING, REMOVE FROM FAIL LIST: chmlib:x64-uwp (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: gl3w:arm-uwp (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: glew:arm-uwp (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: laszip:arm-uwp (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: laszip:x64-uwp (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: opengl:arm-uwp (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: rttr:arm-uwp (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: rttr:x64-uwp (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: seal:arm-uwp (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).
PASSING, REMOVE FROM FAIL LIST: seal:x64-uwp (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt).

:)

REGRESSION: ftgl:arm-uwp failed with BUILD_FAILED. If expected, add ftgl:arm-uwp=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: mathgl:arm-uwp failed with BUILD_FAILED. If expected, add mathgl:arm-uwp=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: opencsg:arm-uwp failed with BUILD_FAILED. If expected, add opencsg:arm-uwp=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.

These were all previously blocked by one of the above passing-remove-from-fail-lists.

REGRESSION: ms-quic:arm-uwp failed with BUILD_FAILED. If expected, add ms-quic:arm-uwp=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: ms-quic:x64-uwp failed with BUILD_FAILED. If expected, add ms-quic:x64-uwp=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: ms-quic:x64-windows failed with BUILD_FAILED. If expected, add ms-quic:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: ms-quic:x64-windows-static-md failed with BUILD_FAILED. If expected, add ms-quic:x64-windows-static-md=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: ms-quic:x86-windows failed with BUILD_FAILED. If expected, add ms-quic:x86-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt.

This port hates the current Windows SDK, and it is a leaf port, so I'm marking it `=fail`:

```
D:\buildtrees\ms-quic\src\v1.2.0-19ce393c24.clean\src\inc\quic_platform_winuser.h(564): error C2375: 'NtQueryTimerResolution': redefinition; different linkage
C:\Program Files (x86)\Windows Kits\10\include\10.0.22621.0\um\winternl.h(713): note: see declaration of 'NtQueryTimerResolution'
D:\buildtrees\ms-quic\src\v1.2.0-19ce393c24.clean\src\inc\quic_platform_winuser.h(765): error C2011: '_THREAD_NAME_INFORMATION': 'struct' type redefinition
C:\Program Files (x86)\Windows Kits\10\include\10.0.22621.0\um\winternl.h(352): note: see declaration of '_THREAD_NAME_INFORMATION'
D:\buildtrees\ms-quic\src\v1.2.0-19ce393c24.clean\src\inc\quic_platform_winuser.h(773): error C2375: 'NtSetInformationThread': redefinition; different linkage
C:\Program Files (x86)\Windows Kits\10\include\10.0.22621.0\um\winternl.h(659): note: see declaration of 'NtSetInformationThread'
```

arm64-windows crashed. Previously opengl failed so we never got here. microsoft/vcpkg-tool#599

```
Building opengl[core]:arm64-windows...
-- Fixing pkgconfig file: D:/packages/opengl_arm64-windows/lib/pkgconfig/glu.pc
-- Fixing pkgconfig file: D:/packages/opengl_arm64-windows/lib/pkgconfig/opengl.pc
-- Using cached msys-mingw-w64-i686-pkg-config-0.29.2-3-any.pkg.tar.zst.
-- Using cached msys-mingw-w64-i686-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst.
-- Using msys root at D:/downloads/tools/msys2/9a1ec3f33446b195
-- Fixing pkgconfig file: D:/packages/opengl_arm64-windows/debug/lib/pkgconfig/glu.pc
-- Fixing pkgconfig file: D:/packages/opengl_arm64-windows/debug/lib/pkgconfig/opengl.pc
-- Performing post-build validation
Found more than 1 architecture in file D:\packages\opengl_arm64-windows\debug\lib\GlU32.Lib
##[error]vcpkg ci failed
At C:\a\2\s\scripts\azure-pipelines\test-modified-ports.ps1:173 char:5
+     throw "vcpkg ci failed"
+     ~~~~~~~~~~~~~~~~~~~~~~~
+ CategoryInfo          : OperationStopped: (vcpkg ci failed:String) [], RuntimeException
+ FullyQualifiedErrorId : vcpkg ci failed
##[error]PowerShell exited with code '1'.
```
github-actions[bot]
github-actions bot previously approved these changes Jun 23, 2022
# Conflicts:
#	scripts/ci.baseline.txt
@BillyONeal BillyONeal merged commit 9ba75e6 into microsoft:master Jun 23, 2022
@BillyONeal BillyONeal deleted the vm-update branch June 23, 2022 22:54
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants