github: test Ninja builds.

backtrace-labs · Mar 30, 2023 · 310d064 · 310d064
1 parent a138af5
commit 310d064
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,6 +16,12 @@ on:
 jobs:
   build-linux:
     runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        generator: ["Unix Makefiles", Ninja]
+
     steps:
       # Install latest CMake.
       - uses: lukka/get-cmake@latest
@@ -30,7 +36,7 @@ jobs:
       - name: CMake
         run: |
           mkdir cbuild
-          cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE
+          cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE -G "${{ matrix.generator }}"
           cmake --build cbuild/
           
       - uses: ruby/setup-ruby@v1
@@ -56,6 +62,12 @@ jobs:
   build-windows:
     # Because we want to use Visual Studio 16 2019, we need to use the windows-2019 GitHub runner
     runs-on: windows-2019
+
+    strategy:
+      fail-fast: false
+      matrix:
+        generator: ["Visual Studio 16 2019", Ninja]
+
     steps:
       # Install latest CMake.
       - uses: lukka/get-cmake@latest
@@ -64,14 +76,19 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Add cl.exe to PATH
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: amd64
+
       - name: CMake
         run: |
           # make a build directory (note: build is already used by Crashpad)
           mkdir cbuild
 
           # run CMake (additional options like -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE are possible)
           # it is recommended to specify the compiler version used for the build
-          cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE -G "Visual Studio 16 2019"
+          cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE -G "${{ matrix.generator }}" -DCMAKE_CXX_COMPILER=cl.exe -DCMAKE_C_COMPILER=cl.exe
           cmake --build cbuild/
 
       - uses: ruby/setup-ruby@v1
@@ -101,6 +118,7 @@ jobs:
       fail-fast: false
       matrix:
         arch: [arm64, x86_64]
+        generator: ["Unix Makefiles", Ninja]
 
     steps:
       # Install latest CMake.
@@ -113,7 +131,7 @@ jobs:
       - name: CMake
         run: |
           mkdir cbuild
-          cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}
+          cmake -S . -B cbuild/ -DBUILD_EXAMPLES=TRUE -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -G "${{ matrix.generator }}"
           cmake --build cbuild/
 
       - uses: ruby/setup-ruby@v1

diff --git a/backtrace/save_artifacts.rb b/backtrace/save_artifacts.rb
@@ -51,8 +51,8 @@ def gather_include_files dir = include_dir
         selected_headers = all_headers
             .reject{ _1 =~ /^#{Regexp.union REJECT_DIRS}/ }
             .map{ [ "include/#{_1}", File.absolute_path(_1) ] }
-        
-        
+
+
         selected_headers += Dir.chdir 'third_party/mini_chromium/mini_chromium' do
             Dir['**/*.h']
                 .map{ [ "include/#{_1}", File.absolute_path(_1) ] }
@@ -82,9 +82,11 @@ def gather_binaries dir = binary_dir
         [ 'client/libclient.a', 'bin/libclient.a' ],
         [ 'handler/handler', 'bin/handler' ],
         [ './client/Debug/client.lib', 'bin/client.lib' ],
-        [ 'handler\Debug\handler.exe', 'bin/handler.exe' ],
+        [ 'handler/Debug/handler.exe', 'bin/handler.exe' ],
         [ './client/Release/client.lib', 'bin/client.lib' ],
-        [ 'handler\Release\handler.exe', 'bin/handler.exe' ],
+        [ 'handler/Release/handler.exe', 'bin/handler.exe' ],
+        [ './client/client.lib', 'bin/client.lib' ],
+        [ 'handler/handler.exe', 'bin/handler.exe' ],
     ]
     Dir.chdir dir do
         files.each do |file, name|

diff --git a/backtrace/test/crashpad_utils.rb b/backtrace/test/crashpad_utils.rb
@@ -117,7 +117,11 @@ def execute tmp_dir: nil
 
     def handler
         if OS.windows?
-            'handler/Debug/handler.exe'
+            [
+                'handler/Debug/handler.exe',
+                'handler/Release/handler.exe',
+                'handler/handler.exe',
+            ].find { |f| File.exist? f }
         else
             'handler/handler'
         end

diff --git a/backtrace/test/test_windows.rb b/backtrace/test/test_windows.rb
@@ -2,9 +2,15 @@
 
 require_relative 'crashpad_utils'
 
-class TestLinux < Minitest::Test
+class TestWindows < Minitest::Test
     def test_crashpad_uploads
-        result = Crashpad::perform_test executable: 'examples/windows/demo/Debug/demo_windows.exe'
+        exe = if File.exist?("#{__dir__}/../../cbuild/examples/windows/demo/Debug/demo_windows.exe")
+            'examples/windows/demo/Debug/demo_windows.exe'
+        else
+            'examples/windows/demo/demo_windows.exe'
+        end
+
+        result = Crashpad::perform_test executable: exe
         assert result
         assert result.has_key? :upload