Skip to content

Commit 5ea9cdd

Browse files
committed
Update tests to use windows-2022 and USD v25.05.01
1 parent dc8b142 commit 5ea9cdd

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

.github/workflows/test-windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ permissions:
1515

1616
jobs:
1717
test-windows:
18-
runs-on: windows-2019
18+
runs-on: windows-2022
1919
timeout-minutes: 300
2020

2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
usd: ["v24.08", "v25.05"]
24+
usd: ["v24.08", "v25.05.01"]
2525
python: ["3.10", "3.12"]
2626

2727
name: "USD-${{ matrix.usd }}-py${{ matrix.python }}"
@@ -65,7 +65,7 @@ jobs:
6565
set VCPKG_TARGET_TRIPLET=x64-windows
6666
set CMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%/scripts/buildsystems/vcpkg.cmake
6767
python ./src/build_scripts/build_usd.py . ^
68-
--generator "Visual Studio 16 2019" ^
68+
--generator "Visual Studio 17 2022" ^
6969
--no-tests ^
7070
--no-examples ^
7171
--no-tutorials ^
@@ -82,7 +82,7 @@ jobs:
8282
export PATH="${{runner.temp}}/USD/bin;${{runner.temp}}/USD/lib;${PATH}"
8383
export PYTHONPATH="${{runner.temp}}/USD/lib/python;${PYTHONPATH}"
8484
cmake \
85-
-G "Visual Studio 16 2019" -A x64 \
85+
-G "Visual Studio 17 2022" -A x64 \
8686
-D "CMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" \
8787
-D "VCPKG_TARGET_TRIPLET=x64-windows" \
8888
-D "BUILD_DOCS=OFF" \

doc/sphinx/release/release_notes.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@
44
Release Notes
55
*************
66

7+
.. release:: Upcoming
8+
9+
.. change:: fixed
10+
11+
Updated Github workflow configuration to test library against
12+
:term:`USD` v23.05.01.
13+
14+
.. change:: fixed
15+
16+
Fixed Windows CI test errors by switching to 'windows-2022' image.
17+
718
.. release:: 0.8.3
819
:date: 2025-05-15
920

src/python/wrapCapturePredicate.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// clang-format off
2+
13
#include "./predicate.h"
24

35
#include "unf/capturePredicate.h"

src/python/wrapTransaction.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// clang-format off
2+
13
#include "./predicate.h"
24

35
#include "unf/broker.h"

0 commit comments

Comments
 (0)