Merge pull request #18 from r52/more-chores

More chores

.github/workflows/build.yml

@@ -1,6 +1,18 @@
 name: Build Quasar
 
 on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - "docs/**"
+      - "**.md"
+      - "**.rst"
+      - "widgets/**"
+      - "**.js"
+      - "**.html"
+      - "**.css"
+      - "**.yml"
   pull_request:
     branches:
       - master
@@ -28,21 +40,24 @@ jobs:
           - builder: windows-clang
             os: windows-latest
             arch: "win64_msvc2019_64"
-            cc: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\x64\bin\clang-cl.exe'
-            cxx: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\x64\bin\clang-cl.exe'
-            g: '-G "Visual Studio 17 2022" -T ClangCL,host=x64 -A x64'
+            cc: clang-cl.exe
+            cxx: clang-cl.exe
+            g: '-G "Ninja Multi-Config"'
+            packages: ninja
           - builder: ubuntu-gcc
             os: ubuntu-latest
             arch: "gcc_64"
             cc: gcc-12
             cxx: g++-12
             g: "-G Ninja"
+            packages: ninja-build
           - builder: ubuntu-clang
             os: ubuntu-latest
             arch: "gcc_64"
             cc: clang-16
             cxx: clang++-16
             g: "-G Ninja"
+            packages: ninja-build
 
     name: Build Quasar
     runs-on: ${{ matrix.os }}
@@ -63,16 +78,26 @@ jobs:
           modules: qtwebengine qtpositioning qtwebchannel qtnetworkauth qtserialport
           cache: "true"
 
-      - name: Set up Ninja
+      - name: Set up Packages (Linux)
         if: runner.os == 'Linux'
-        run: sudo apt-get install -y ninja-build
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ${{ matrix.packages }}
+
+      - name: Set up Packages (Windows)
+        if: runner.os == 'Windows'
+        run: choco install ${{ matrix.packages }}
 
       - name: Set up Clang
-        if: matrix.builder == 'ubuntu-clang'
+        if: matrix.builder == 'ubuntu-clang' || matrix.builder == 'windows-clang'
         uses: egor-tensin/setup-clang@v1
         with:
           version: 16
 
+      - name: Setup MSVC Environment (Windows)
+        if: runner.os == 'Windows'
+        uses: ilammy/msvc-dev-cmd@v1
+
       - name: Cache vcpkg
         uses: lukka/run-vcpkg@v10
         with:
@@ -86,15 +111,15 @@ jobs:
         run: cmake --no-warn-unused-cli -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -S./ -B./build ${{ matrix.g }}
 
       - name: Build Project
-        run: cmake --build ./build --config Release --
+        run: cmake --build ./build --config Release --target all --
 
       - name: Package Quasar
         if: runner.os == 'Windows'
         shell: powershell
         run: |
           $QUASAR_VERSION = (Select-String -Path ./quasar/CMakeLists.txt -Pattern 'project\(quasar VERSION ([0-9\.]+)\)') | %{$_.Matches.Groups[1].value}
           $RELEASE_PACKAGE_FILE = "quasar-windows-v$QUASAR_VERSION.zip"
-          Compress-Archive ./build/quasar/Release/* $RELEASE_PACKAGE_FILE
+          7z a $RELEASE_PACKAGE_FILE ./build/quasar/Release/*
           $release_filepath = Get-ChildItem $RELEASE_PACKAGE_FILE | %{$_[0].FullName}
           echo "RELEASE_PACKAGE_PATH=$release_filepath" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
@@ -103,7 +128,7 @@ jobs:
         shell: powershell
         run: |
           $WIDGETS_PACKAGE_FILE = "quasar-sample-widgets.zip"
-          Compress-Archive ./widgets/ $WIDGETS_PACKAGE_FILE
+          7z a $WIDGETS_PACKAGE_FILE ./widgets/
           $widgets_filepath = Get-ChildItem $WIDGETS_PACKAGE_FILE | %{$_[0].FullName}
           echo "WIDGETS_PACKAGE_FILE=$widgets_filepath" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append