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.

Sign up for GitHub

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

Jump to bottom

[openxr-loader] Fix build failure in world rebuild CI. #23191

Merged
merged 2 commits into from
Feb 22, 2022
Merged

[openxr-loader] Fix build failure in world rebuild CI. #23191

merged 2 commits into from
Feb 22, 2022

Conversation

Hoikas
Copy link
Contributor

@Hoikas Hoikas commented Feb 20, 2022

Fixes an observed failure in CI when #23156 triggered a world rebuild. Evidently the markupsafe Python package renamed soft_unicode to soft_str at some point,

  • What does your PR fix?

    Observed failure:
Traceback (most recent call last):
  File "D:\buildtrees\openxr-loader\src\ase-1.0.21-8166c3773a.clean\scripts\hpp_genxr.py", line 220, in 
    genTarget(args)
  File "D:\buildtrees\openxr-loader\src\ase-1.0.21-8166c3773a.clean\scripts\hpp_genxr.py", line 116, in genTarget
    gen = CppGenerator(errFile=errWarn,
  File "D:\buildtrees\openxr-loader\src\ase-1.0.21-8166c3773a.clean\scripts\cpp_generator.py", line 427, in __init__
    self.env = make_jinja_environment(file_with_templates_as_sibs=__file__, trim_blocks=False)
  File "D:\buildtrees\openxr-loader\src\ase-1.0.21-8166c3773a.clean\scripts\jinja_helpers.py", line 140, in make_jinja_environment
    from jinja2 import Environment, FileSystemLoader
  File "D:\buildtrees\openxr-loader\src\ase-1.0.22-27be7bd21f.clean\external\python\jinja2\__init__.py", line 33, in 
    from jinja2.environment import Environment, Template
  File "D:\buildtrees\openxr-loader\src\ase-1.0.22-27be7bd21f.clean\external\python\jinja2\environment.py", line 15, in 
    from jinja2 import nodes
  File "D:\buildtrees\openxr-loader\src\ase-1.0.22-27be7bd21f.clean\external\python\jinja2\nodes.py", line 19, in 
    from jinja2.utils import Markup
  File "D:\buildtrees\openxr-loader\src\ase-1.0.22-27be7bd21f.clean\external\python\jinja2\utils.py", line 642, in 
    from markupsafe import Markup, escape, soft_unicode
ImportError: cannot import name 'soft_unicode' from 'markupsafe' (D:\downloads\tools\python\python-3.10.2-x86\lib\site-packages\markupsafe\__init__.py)

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

    No change

  • 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

github-actions[bot]
github-actions bot approved these changes Feb 20, 2022
View reviewed changes
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/openxr-loader/vcpkg.json

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

@Hoikas Hoikas mentioned this pull request Feb 20, 2022
Merged
@JonLiu1993 JonLiu1993 self-assigned this Feb 21, 2022
@JonLiu1993 JonLiu1993 added the category:port-bug The issue is with a library, which is something the port should already support label Feb 21, 2022
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Feb 21, 2022
@vicroms vicroms merged commit faa4527 into microsoft:master Feb 22, 2022
@Hoikas Hoikas deleted the fix-openxr-loader branch February 22, 2022 22:59
BillyONeal added a commit to BillyONeal/vcpkg that referenced this pull request Feb 24, 2022
@BillyONeal
Fix many many bugs in the changelog generation script:
9161eae 
84: Pass StartDate and EndDate to Get-MergedPullRequests instead of special casing only Credentials
109+130: Fix calculating negative progress caused by seeing PRs in the future because GitHub returns times in UTC
268: Actually make filtering for infrastructure PRs functional
303: Fix extraction of port-version from vcpkg.json. This really should be handled by diffing baseline.json in the future.
374-382: Fix expression ordering and casting problem which prevented non-CONTROL ports from ever being considered "new"

Also skip emitting headers for empty blocks, update and sort current triplet list, and move infrastructure bits below
port modifications.

Example output:

vcpkg (2022.02.19 - 2022.02.22)
---
#### Total port count:
#### Total port count per triplet (tested):
|triplet|ports available|
|---|---|
|x86-windows|NUM|
|**x64-windows**|NUM|
|x64-windows-static|NUM|
|x64-windows-static-md|NUM|
|x64-uwp|NUM|
|arm64-windows|NUM|
|arm-uwp|NUM|
|**x64-osx**|NUM|
|**x64-linux**|NUM|
<details>
<summary><b>The following 2 ports have been added:</b></summary>

|port|version|
|---|---|
|[libcurl-simple-https](microsoft#22917
|[triton](microsoft#23111

</details>
<details>
<summary><b>The following 18 ports have been updated:</b></summary>

- polyhook2 `2022-02-06#0` -> `2022-02-21#0`
    - [(microsoft#23203)](microsoft#23203) [polyhook2] Update to latest (2022-02-21) (by @acidicoala)
- graphviz `2.49.1#1` -> `2.49.1#2`
    - [(microsoft#23148)](microsoft#23148) [graphviz] Fix tools (by @Ace314159)
- itk `5.1.0#7` -> `5.2.1#0`
    - [(microsoft#23158)](microsoft#23158) [ITK] update to v5.2.1 (by @Adela0814)
- qhull `8.0.2#2` -> `8.0.2#3`
    - [(microsoft#23129)](microsoft#23129) [qhull] Fix copyright, pc files, cmake usage (by @dg0yt)
- tgui `2021-04-19#2` -> `2021-04-19#3`
    - [(microsoft#23211)](microsoft#23211) [tgui] fix absolute paths (by @autoantwort)
- json-dto `0.3.0#0` -> `0.3.1#0`
    - [(microsoft#23224)](microsoft#23224) [json-dto] Update to 0.3.1 (by @eao197)
- leveldb `1.22#4` -> `1.22#5`
    - [(microsoft#23180)](microsoft#23180) [leveldb] Fix homepage (by @MarcoFalke)
- openxr-loader `1.0.22#0` -> `1.0.22#1`
    - [(microsoft#23191)](microsoft#23191) [openxr-loader] Fix build failure in world rebuild CI. (by @Hoikas)
- ngspice `35#1` -> `35#2`
    - [(microsoft#23151)](microsoft#23151) [ngspice] Fix error C2065 (by @Cheney-W)
- openmvg `2.0#1` -> `2.0#2`
    - [(microsoft#23114)](microsoft#23114) [cereal] Update to 1.3.1 (by @mapret)
- lazy-importer `2021-10-23#0` -> `2022-02-09#0`
    - [(microsoft#23192)](microsoft#23192) [lazy-importer] Update to 2022-02-09 (by @Thomas1664)
- gstreamer `1.19.2#3` -> `1.19.2#4`
    - [(microsoft#23125)](microsoft#23125) [gstreamer] Support arm-windows and add features (by @JackBoosY)
- charls `2.2.0#2` -> `2.3.4#0`
    - [(microsoft#23189)](microsoft#23189) [charls] Update to 2.3.4 (by @Thomas1664)
- arrow `7.0.0#0` -> `7.0.0#1`
    - [(microsoft#23188)](microsoft#23188) [arrow] add plasma support for non Windows platforms (by @fran6co)
- trantor `1.5.4#0` -> `1.5.5#0`
    - [(microsoft#23182)](microsoft#23182) [trantor] Update to 1.5.5 (by @an-tao)
- capstone `4.0.2#2` -> `4.0.2#3`
    - [(microsoft#23122)](microsoft#23122) [capstone] Use static runtime if capstone wants to be statically linked (by @illera88)
- gainput `1.0.0#4` -> `1.0.0#5`
    - [(microsoft#23219)](microsoft#23219) [gainput] Support Linux (by @JackBoosY)
- cereal `1.3.0#1` -> `1.3.1#0`
    - [(microsoft#23114)](microsoft#23114) [cereal] Update to 1.3.1 (by @mapret)

</details>
<details>
<summary>The following additional changes have been made to vcpkg's infrastructure:</summary>

- [(microsoft#23045)](microsoft#23045) [vcpkg docs] Update ko_KR translation (by @jnooree)
- [(microsoft#23181)](microsoft#23181) [vcpkg doc] Fixes typo in vcpkg_download_distfile.cmake (by @acd1034)

</details>
-- vcpkg team vcpkg@microsoft.com Thu, 24 February 00:29:57 -0800
@BillyONeal BillyONeal mentioned this pull request Feb 24, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions approved these changes

@JonLiu1993 JonLiu1993 JonLiu1993 approved these changes

Assignees

@JonLiu1993 JonLiu1993

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Hoikas @JonLiu1993 @vicroms