From 1b7a622f9c83ed93ebd1cef0ddb43ba09767fb52 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 28 Sep 2025 12:13:35 -0400 Subject: [PATCH] Remove unused project references and enhance pre-release testing in CI workflow - Deleted references to the yaze_test, yaze_core, yaze_c, and z3ed projects from the Visual Studio solution file (YAZE.sln) to streamline the project structure. - Added a non-blocking test execution step for pre-release versions in the GitHub Actions workflow (release.yml), allowing tests to run without failing the release process, improving CI reliability. --- .github/workflows/release.yml | 16 ++++++++++ YAZE.sln | 56 ----------------------------------- 2 files changed, 16 insertions(+), 56 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dfcb5a57..f9474196 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -261,6 +261,22 @@ jobs: cmake --build build --config ${{ env.BUILD_TYPE }} --parallel echo "Build completed successfully!" + # Optional: Run tests for pre-release versions (non-blocking) + - name: Run tests (pre-release only, non-blocking) + if: contains(needs.validate-and-prepare.outputs.tag_name, 'beta') || contains(needs.validate-and-prepare.outputs.tag_name, 'alpha') || contains(needs.validate-and-prepare.outputs.tag_name, 'rc') || contains(needs.validate-and-prepare.outputs.tag_name, '0.3.') + run: | + echo "Running tests for pre-release version (non-blocking)..." + # Try to build and run tests, but don't fail the release if they fail + cmake --build build --config ${{ env.BUILD_TYPE }} --target yaze_test || echo "Test build failed, continuing with release" + if [ -f "build/bin/${{ env.BUILD_TYPE }}/yaze_test.exe" ] || [ -f "build/bin/yaze_test" ]; then + echo "Test executable found, running tests..." + # Run tests but don't fail the release + ./build/bin/${{ env.BUILD_TYPE }}/yaze_test.exe --gtest_output=xml:test_results.xml || echo "Tests failed, but continuing with release" + else + echo "Test executable not found, skipping tests" + fi + continue-on-error: true + # Test executable functionality - name: Test executable functionality shell: bash diff --git a/YAZE.sln b/YAZE.sln index 58dc8bd1..5acb8afd 100644 --- a/YAZE.sln +++ b/YAZE.sln @@ -4,14 +4,6 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAZE", "YAZE.vcxproj", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaze_test", "test\yaze_test.vcxproj", "{B2C3D4E5-F6G7-8901-BCDE-F23456789012}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaze_core", "yaze_core.vcxproj", "{C3D4E5F6-G7H8-9012-CDEF-345678901234}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaze_c", "yaze_c.vcxproj", "{D4E5F6G7-H8I9-0123-DEF0-456789012345}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "z3ed", "cli\z3ed.vcxproj", "{E5F6G7H8-I9J0-1234-EF01-567890123456}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -34,54 +26,6 @@ Global {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM64.Build.0 = Debug|ARM64 {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM64.ActiveCfg = Release|ARM64 {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM64.Build.0 = Release|ARM64 - {B2C3D4E5-F6G7-8901-BCDE-F23456789012}.Debug|x64.ActiveCfg = Debug|x64 - {B2C3D4E5-F6G7-8901-BCDE-F23456789012}.Debug|x64.Build.0 = Debug|x64 - {B2C3D4E5-F6G7-8901-BCDE-F23456789012}.Release|x64.ActiveCfg = Release|x64 - {B2C3D4E5-F6G7-8901-BCDE-F23456789012}.Release|x64.Build.0 = Release|x64 - {B2C3D4E5-F6G7-8901-BCDE-F23456789012}.Debug|x86.ActiveCfg = Debug|Win32 - {B2C3D4E5-F6G7-8901-BCDE-F23456789012}.Debug|x86.Build.0 = Debug|Win32 - {B2C3D4E5-F6G7-8901-BCDE-F23456789012}.Release|x86.ActiveCfg = Release|Win32 - {B2C3D4E5-F6G7-8901-BCDE-F23456789012}.Release|x86.Build.0 = Release|Win32 - {B2C3D4E5-F6G7-8901-BCDE-F23456789012}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {B2C3D4E5-F6G7-8901-BCDE-F23456789012}.Debug|ARM64.Build.0 = Debug|ARM64 - {B2C3D4E5-F6G7-8901-BCDE-F23456789012}.Release|ARM64.ActiveCfg = Release|ARM64 - {B2C3D4E5-F6G7-8901-BCDE-F23456789012}.Release|ARM64.Build.0 = Release|ARM64 - {C3D4E5F6-G7H8-9012-CDEF-345678901234}.Debug|x64.ActiveCfg = Debug|x64 - {C3D4E5F6-G7H8-9012-CDEF-345678901234}.Debug|x64.Build.0 = Debug|x64 - {C3D4E5F6-G7H8-9012-CDEF-345678901234}.Release|x64.ActiveCfg = Release|x64 - {C3D4E5F6-G7H8-9012-CDEF-345678901234}.Release|x64.Build.0 = Release|x64 - {C3D4E5F6-G7H8-9012-CDEF-345678901234}.Debug|x86.ActiveCfg = Debug|Win32 - {C3D4E5F6-G7H8-9012-CDEF-345678901234}.Debug|x86.Build.0 = Debug|Win32 - {C3D4E5F6-G7H8-9012-CDEF-345678901234}.Release|x86.ActiveCfg = Release|Win32 - {C3D4E5F6-G7H8-9012-CDEF-345678901234}.Release|x86.Build.0 = Release|Win32 - {C3D4E5F6-G7H8-9012-CDEF-345678901234}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {C3D4E5F6-G7H8-9012-CDEF-345678901234}.Debug|ARM64.Build.0 = Debug|ARM64 - {C3D4E5F6-G7H8-9012-CDEF-345678901234}.Release|ARM64.ActiveCfg = Release|ARM64 - {C3D4E5F6-G7H8-9012-CDEF-345678901234}.Release|ARM64.Build.0 = Release|ARM64 - {D4E5F6G7-H8I9-0123-DEF0-456789012345}.Debug|x64.ActiveCfg = Debug|x64 - {D4E5F6G7-H8I9-0123-DEF0-456789012345}.Debug|x64.Build.0 = Debug|x64 - {D4E5F6G7-H8I9-0123-DEF0-456789012345}.Release|x64.ActiveCfg = Release|x64 - {D4E5F6G7-H8I9-0123-DEF0-456789012345}.Release|x64.Build.0 = Release|x64 - {D4E5F6G7-H8I9-0123-DEF0-456789012345}.Debug|x86.ActiveCfg = Debug|Win32 - {D4E5F6G7-H8I9-0123-DEF0-456789012345}.Debug|x86.Build.0 = Debug|Win32 - {D4E5F6G7-H8I9-0123-DEF0-456789012345}.Release|x86.ActiveCfg = Release|Win32 - {D4E5F6G7-H8I9-0123-DEF0-456789012345}.Release|x86.Build.0 = Release|Win32 - {D4E5F6G7-H8I9-0123-DEF0-456789012345}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {D4E5F6G7-H8I9-0123-DEF0-456789012345}.Debug|ARM64.Build.0 = Debug|ARM64 - {D4E5F6G7-H8I9-0123-DEF0-456789012345}.Release|ARM64.ActiveCfg = Release|ARM64 - {D4E5F6G7-H8I9-0123-DEF0-456789012345}.Release|ARM64.Build.0 = Release|ARM64 - {E5F6G7H8-I9J0-1234-EF01-567890123456}.Debug|x64.ActiveCfg = Debug|x64 - {E5F6G7H8-I9J0-1234-EF01-567890123456}.Debug|x64.Build.0 = Debug|x64 - {E5F6G7H8-I9J0-1234-EF01-567890123456}.Release|x64.ActiveCfg = Release|x64 - {E5F6G7H8-I9J0-1234-EF01-567890123456}.Release|x64.Build.0 = Release|x64 - {E5F6G7H8-I9J0-1234-EF01-567890123456}.Debug|x86.ActiveCfg = Debug|Win32 - {E5F6G7H8-I9J0-1234-EF01-567890123456}.Debug|x86.Build.0 = Debug|Win32 - {E5F6G7H8-I9J0-1234-EF01-567890123456}.Release|x86.ActiveCfg = Release|Win32 - {E5F6G7H8-I9J0-1234-EF01-567890123456}.Release|x86.Build.0 = Release|Win32 - {E5F6G7H8-I9J0-1234-EF01-567890123456}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {E5F6G7H8-I9J0-1234-EF01-567890123456}.Debug|ARM64.Build.0 = Debug|ARM64 - {E5F6G7H8-I9J0-1234-EF01-567890123456}.Release|ARM64.ActiveCfg = Release|ARM64 - {E5F6G7H8-I9J0-1234-EF01-567890123456}.Release|ARM64.Build.0 = Release|ARM64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE