diff --git a/.github/workflows/ci_automation_test.yml b/.github/workflows/ci_automation_test.yml index 18a56ca5..960d4539 100644 --- a/.github/workflows/ci_automation_test.yml +++ b/.github/workflows/ci_automation_test.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-latest, windows-latest] + platform: [ubuntu-latest] # platform: [windows-latest, ubuntu-latest] # this does not work under macos-latest (may be "Off-screen Mesa" could help) @@ -45,38 +45,38 @@ jobs: cmake .. -DCMAKE_BUILD_TYPE=Release -DHELLOIMGUI_WIN32_NO_CONSOLE=OFF -DHELLOIMGUI_WIN32_AUTO_WINMAIN=OFF -DHELLOIMGUI_DOWNLOAD_FREETYPE_IF_NEEDED=ON cmake --build . -j 3 --config Release - - name: install mesa OpenGL software renderer (windows only) - shell: bash - if: ${{ matrix.platform == 'windows-latest' }} - run: | - # Download the archive - curl -L -O https://github.com/pal1000/mesa-dist-win/releases/download/23.1.9/mesa3d-23.1.9-release-msvc.7z - - # Extract the archive using 7-zip which is preinstalled on the GitHub Actions Windows runner - 7z x mesa3d-23.1.9-release-msvc.7z -omesa3d - - # Optionally move/copy the required DLLs to the directory of your executable - # For this example, I'll assume your executable is in '.github/ci_automation_tests/build' - # Copy the opengl32.dll to your executable directory - cp mesa3d/x64/*.* .github/ci_automation_tests/build/Release - - - name: Run C++ Automation Test (windows) - shell: bash - if: ${{ matrix.platform == 'windows-latest' }} - run: | - cd .github/ci_automation_tests/build/Release - - # Run the application, but don't exit the script even if it fails - # Under windows, the app works well a local machine and on GitHub CI - # However it ends with a segfault on Github CI, althought it did run to the end. - # Let's detect this via an old-style hack. - ./ci_automation_test_app_bundle.exe || true +# - name: install mesa OpenGL software renderer (windows only) +# shell: bash +# if: ${{ matrix.platform == 'windows-latest' }} +# run: | +# # Download the archive +# curl -L -O https://github.com/pal1000/mesa-dist-win/releases/download/23.1.9/mesa3d-23.1.9-release-msvc.7z +# +# # Extract the archive using 7-zip which is preinstalled on the GitHub Actions Windows runner +# 7z x mesa3d-23.1.9-release-msvc.7z -omesa3d +# +# # Optionally move/copy the required DLLs to the directory of your executable +# # For this example, I'll assume your executable is in '.github/ci_automation_tests/build' +# # Copy the opengl32.dll to your executable directory +# cp mesa3d/x64/*.* .github/ci_automation_tests/build/Release - # Now check for the success file - if [[ ! -f ci_automation_test_app_success.txt ]]; then - echo "Error: ci_automation_test_app_success.txt not found!" - exit 1 - fi +# - name: Run C++ Automation Test (windows) +# shell: bash +# if: ${{ matrix.platform == 'windows-latest' }} +# run: | +# cd .github/ci_automation_tests/build/Release +# +# # Run the application, but don't exit the script even if it fails +# # Under windows, the app works well a local machine and on GitHub CI +# # However it ends with a segfault on Github CI, althought it did run to the end. +# # Let's detect this via an old-style hack. +# ./ci_automation_test_app_bundle.exe || true +# +# # Now check for the success file +# if [[ ! -f ci_automation_test_app_success.txt ]]; then +# echo "Error: ci_automation_test_app_success.txt not found!" +# exit 1 +# fi - name: Run C++ Automation Test (nixes) shell: bash diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml index ad3384ac..cfed6f5b 100644 --- a/.github/workflows/pip.yml +++ b/.github/workflows/pip.yml @@ -62,9 +62,9 @@ jobs: - name: pytest run: pytest - - name: CI Automation python test (windows and ubuntu) + - name: CI Automation python test (ubuntu) shell: bash - if: ${{ matrix.platform == 'ubuntu-latest' || matrix.platform == 'windows-latest' }} + if: ${{ matrix.platform == 'ubuntu-latest' }} run: | cd .github/ci_automation_tests python ci_automation_test_app_bundle.py