From cfbdba050c9c66c1b48a72752a2f6d6f35cf2fc7 Mon Sep 17 00:00:00 2001 From: Fedor Chelnokov Date: Sat, 30 May 2026 11:53:39 +0300 Subject: [PATCH] CI: derive Windows test_artifacts_path from matrix fields Drop the per-entry "test_artifacts_path" from the windows-*-config matrix files and instead compute it in build-test-windows.yml as windows/{vcpkg_triplet}/{config}/{build_system}. This removes the hand-maintained paths (which had a collision in the minimal config, where two distinct jobs both mapped to windows/windows-2022/Debug) and guarantees a unique S3 upload path per job. Co-Authored-By: Claude Opus 4.7 --- .github/workflows/build-test-windows.yml | 2 +- .../windows-finalize-release-config.json | 9 +++---- .../workflows/matrix/windows-full-config.json | 27 +++++++------------ .../matrix/windows-minimal-config.json | 12 +++------ .../matrix/windows-standard-config.json | 15 ++++------- 5 files changed, 22 insertions(+), 43 deletions(-) diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml index 6fe3bfe19f67..4498d05586fe 100644 --- a/.github/workflows/build-test-windows.yml +++ b/.github/workflows/build-test-windows.yml @@ -303,7 +303,7 @@ jobs: build_config: ${{ matrix.config }} pytest_args: "${{ env.BUILD_C_SHARP == 'true' && env.PYTEST_C_SHARP_ARGS || '' }} --run-cuda=negative --junit-xml=../unit_tests_report_regression.xml" smoke: ${{ !inputs.full_config_build && matrix.config == 'Debug' }} - test_artifacts_path: ${{ matrix.test_artifacts_path }} + test_artifacts_path: windows/${{ matrix.vcpkg_triplet }}/${{ matrix.config }}/${{ matrix.build_system }} upload_test_artifacts: ${{ inputs.upload_test_artifacts }} - name: Generate Test Performance Report diff --git a/.github/workflows/matrix/windows-finalize-release-config.json b/.github/workflows/matrix/windows-finalize-release-config.json index 5b9c596ae59d..e4d33af2a45a 100644 --- a/.github/workflows/matrix/windows-finalize-release-config.json +++ b/.github/workflows/matrix/windows-finalize-release-config.json @@ -5,16 +5,14 @@ "config": "Debug", "build_system": "CMake", "vcpkg_triplet": "x64-windows-vs2019-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Debug" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2019", "config": "Release", "build_system": "CMake", "vcpkg_triplet": "x64-windows-vs2019-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Release" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2019", @@ -22,8 +20,7 @@ "build_system": "CMake", "vcpkg_triplet": "x64-windows-meshlib-iterator-debug", "upload_name": "Debug-IteratorDebug", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Debug-IteratorDebug" + "runner": ["windows-2022"] } ] } diff --git a/.github/workflows/matrix/windows-full-config.json b/.github/workflows/matrix/windows-full-config.json index 0071d6801ced..3f4ff7fe0f76 100644 --- a/.github/workflows/matrix/windows-full-config.json +++ b/.github/workflows/matrix/windows-full-config.json @@ -5,64 +5,56 @@ "config": "Debug", "build_system": "MSBuild", "vcpkg_triplet": "x64-windows-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2022/Debug" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2022", "config": "Release", "build_system": "MSBuild", "vcpkg_triplet": "x64-windows-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2022/Release" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2022", "config": "Debug", "build_system": "CMake", "vcpkg_triplet": "x64-windows-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2022/Debug" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2022", "config": "Release", "build_system": "CMake", "vcpkg_triplet": "x64-windows-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2022/Release" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2019", "config": "Debug", "build_system": "MSBuild", "vcpkg_triplet": "x64-windows-vs2019-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Debug" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2019", "config": "Release", "build_system": "MSBuild", "vcpkg_triplet": "x64-windows-vs2019-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Release" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2019", "config": "Debug", "build_system": "CMake", "vcpkg_triplet": "x64-windows-vs2019-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Debug" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2019", "config": "Release", "build_system": "CMake", "vcpkg_triplet": "x64-windows-vs2019-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Release" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2019", @@ -70,8 +62,7 @@ "build_system": "CMake", "vcpkg_triplet": "x64-windows-meshlib-iterator-debug", "upload_name": "Debug-IteratorDebug", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Debug-IteratorDebug" + "runner": ["windows-2022"] } ] } diff --git a/.github/workflows/matrix/windows-minimal-config.json b/.github/workflows/matrix/windows-minimal-config.json index 25a18d9e2e3c..74a9a29ab826 100644 --- a/.github/workflows/matrix/windows-minimal-config.json +++ b/.github/workflows/matrix/windows-minimal-config.json @@ -5,24 +5,21 @@ "config": "Release", "build_system": "CMake", "vcpkg_triplet": "x64-windows-vs2019-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Release" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2022", "config": "Debug", "build_system": "MSBuild", "vcpkg_triplet": "x64-windows-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2022/Debug" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2022", "config": "Release", "build_system": "CMake", "vcpkg_triplet": "x64-windows-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2022/Debug" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2019", @@ -30,8 +27,7 @@ "build_system": "CMake", "vcpkg_triplet": "x64-windows-meshlib-iterator-debug", "upload_name": "Debug-IteratorDebug", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Debug-IteratorDebug" + "runner": ["windows-2022"] } ] } diff --git a/.github/workflows/matrix/windows-standard-config.json b/.github/workflows/matrix/windows-standard-config.json index 3fecc0854e10..d65315f433f6 100644 --- a/.github/workflows/matrix/windows-standard-config.json +++ b/.github/workflows/matrix/windows-standard-config.json @@ -5,32 +5,28 @@ "config": "Debug", "build_system": "CMake", "vcpkg_triplet": "x64-windows-vs2019-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Debug" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2019", "config": "Release", "build_system": "CMake", "vcpkg_triplet": "x64-windows-vs2019-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Release" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2022", "config": "Release", "build_system": "MSBuild", "vcpkg_triplet": "x64-windows-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2022/Release" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2022", "config": "Release", "build_system": "CMake", "vcpkg_triplet": "x64-windows-meshlib", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2022/Release" + "runner": ["windows-2022"] }, { "cxx_compiler": "msvc-2019", @@ -38,8 +34,7 @@ "build_system": "CMake", "vcpkg_triplet": "x64-windows-meshlib-iterator-debug", "upload_name": "Debug-IteratorDebug", - "runner": ["windows-2022"], - "test_artifacts_path": "windows/windows-2019/Debug-IteratorDebug" + "runner": ["windows-2022"] } ] }