Skip to content

Commit f52264f

Browse files
authored
Merge pull request #340 from externpro/xpupdate-26.01-17-g15c9354-25578174165-1
externpro 26.01-17-g15c9354
2 parents 45c60cb + fe53010 commit f52264f

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/system-info.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
-
1717
name: Checkout repository
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
-
2020
name: Runner Information
2121
id: runner-info

.github/workflows/xpbuild.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,4 @@ jobs:
2626
windows:
2727
uses: externpro/externpro/.github/workflows/build-windows.yml@26.01
2828
secrets: inherit
29-
with:
30-
vs_compilers: '["Vs2022"]'
29+
with: {}

test/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ foreach(pro ${pros})
7676
target_compile_definitions(${pro}_test PRIVATE ${${pro}_compile_definitions})
7777
list(APPEND all_compile_definitions ${${pro}_compile_definitions})
7878
endif()
79-
if(pro STREQUAL "wxx" AND XVFB_RUN_EXEC)
79+
if(pro STREQUAL "wxx" AND MSVC_VERSION VERSION_EQUAL 1950)
80+
message(STATUS "Skipping wxx_test on VS2026 (MSVC_VERSION 1950) due to known hang issue")
81+
elseif(pro STREQUAL "wxx" AND XVFB_RUN_EXEC)
8082
add_test(NAME ${pro}_test COMMAND ${XVFB_RUN_EXEC} -a
8183
--server-args=-screen\ 0\ 1920x1080x24\ -nolisten\ tcp
8284
$<TARGET_FILE:${pro}_test>

0 commit comments

Comments
 (0)