Merge pull request #6475 from BOINC/vko_split_windows_ci_builds

AenBleidd · web-flow · commit b6508721b4f5 · 2025-08-09T01:24:41.000+02:00
[ci][windows] split msbuild and cmake builds, add debug builds
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -45,14 +45,13 @@ env:
   OpenCppCoverageVersion: 0.9.9.0
 
 jobs:
-  build:
-    name: ${{matrix.configuration}}-${{matrix.platform}}-${{matrix.type}}
+  msbuild:
+    name: ${{matrix.configuration}}-${{matrix.platform}}-msbuild
     runs-on: windows-2022
     strategy:
       matrix:
-        type: [libs-cmake, msbuild]
         platform: [x64, arm64]
-        configuration: [Release]
+        configuration: [Release, Debug]
       fail-fast: false
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -62,14 +61,14 @@ jobs:
 
       - name: Download OpenCppCoverage
         uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9
-        if: success() && matrix.platform == 'x64'
+        if: success() && matrix.platform == 'x64' && matrix.configuration == 'Release'
         id: DownloadOpenCppCoverage
         with:
           url: "https://github.com/OpenCppCoverage/OpenCppCoverage/releases/download/release-${{ env.OpenCppCoverageVersion }}/OpenCppCoverageSetup-x64-${{ env.OpenCppCoverageVersion }}.exe"
           target: ${{github.workspace}}\temp\
 
       - name: Install OpenCppCoverage
-        if: success() && matrix.platform == 'x64'
+        if: success() && matrix.platform == 'x64' && matrix.configuration == 'Release'
         shell: powershell
         run: |
           Start-Process "${{github.workspace}}\temp\OpenCppCoverageSetup-x64-${{ env.OpenCppCoverageVersion }}.exe" -ArgumentList "/verysilent /dir=${{github.workspace}}\temp\OpenCppCoverage" -Wait
@@ -98,16 +97,16 @@ jobs:
           key: windows-${{matrix.platform}}-${{matrix.configuration}}-${{hashFiles('win_build/vcpkg_3rdparty_dependencies.vcxproj', '.github/workflows/windows.yml')}}
 
       - name: Install Trusted Signing Client Tools
-        if: success() && matrix.type == 'msbuild' && startsWith(github.ref, 'refs/tags/') && env.AZURE_CLIENT_ID != 0 && env.AZURE_CLIENT_SECRET != 0 && env.AZURE_TENANT_ID != 0 && env.AZURE_ENDPOINT != 0 && env.AZURE_CODE_SIGNING_NAME != 0 && env.AZURE_CERT_PROFILE_NAME != 0
+        if: success() && matrix.configuration == 'Release' && startsWith(github.ref, 'refs/tags/') && env.AZURE_CLIENT_ID != 0 && env.AZURE_CLIENT_SECRET != 0 && env.AZURE_TENANT_ID != 0 && env.AZURE_ENDPOINT != 0 && env.AZURE_CODE_SIGNING_NAME != 0 && env.AZURE_CERT_PROFILE_NAME != 0
         run: nuget.exe install Microsoft.Trusted.Signing.Client -Version 1.0.60 -x -OutputDirectory "${{ env.TSCT }}"
 
       - name: Write metadata.json
-        if: success() && matrix.type == 'msbuild' && startsWith(github.ref, 'refs/tags/') && env.AZURE_CLIENT_ID != 0 && env.AZURE_CLIENT_SECRET != 0 && env.AZURE_TENANT_ID != 0 && env.AZURE_ENDPOINT != 0 && env.AZURE_CODE_SIGNING_NAME != 0 && env.AZURE_CERT_PROFILE_NAME != 0
+        if: success() && matrix.configuration == 'Release' && startsWith(github.ref, 'refs/tags/') && env.AZURE_CLIENT_ID != 0 && env.AZURE_CLIENT_SECRET != 0 && env.AZURE_TENANT_ID != 0 && env.AZURE_ENDPOINT != 0 && env.AZURE_CODE_SIGNING_NAME != 0 && env.AZURE_CERT_PROFILE_NAME != 0
         run: |
           python ./ci_tools/create_signing_metadata.py "${{ env.DMDF }}" "${{ env.AZURE_ENDPOINT }}" "${{ env.AZURE_CODE_SIGNING_NAME }}" "${{ env.AZURE_CERT_PROFILE_NAME }}"
 
       - name: Install MsiVal2 and Orca tools
-        if: success() && matrix.type == 'msbuild' && !startsWith(github.ref, 'refs/tags/')
+        if: success() && !startsWith(github.ref, 'refs/tags/') && matrix.configuration == 'Release'
         shell: powershell
         run: |
           md -Force ./temp
@@ -123,31 +122,27 @@ jobs:
           Start-Process "msiexec.exe" -ArgumentList "/i temp\Orca-x86_en-us.msi" -Wait
 
       - name: Build
-        if: success() && matrix.type == 'msbuild'
+        if: success()
         run: msbuild win_build\boinc.sln -p:Configuration=${{matrix.configuration}} -p:Platform=${{matrix.platform}} -p:VcpkgTripletConfig=ci -p:DLIB=${{ env.DLIB }} -p:DMDF=${{ env.DMDF }} -m
 
-      - name: Build CMake
-        if: success() && matrix.type == 'libs-cmake'
-        run: windows\ci_build_libs_cmake.bat ${{matrix.platform}} ${{matrix.configuration}}
-
       - name: Run unit tests
-        if: success() && matrix.platform == 'x64' && matrix.type == 'msbuild'
+        if: success() && matrix.platform == 'x64' && matrix.configuration == 'Release'
         working-directory: win_build\Build\${{matrix.platform}}\${{matrix.configuration}}
         run: |
           ${{github.workspace}}\temp\OpenCppCoverage\OpenCppCoverage.exe --cover_children --optimized_build --sources ${{github.workspace}} --export_type=binary:gtest.cov -- unittests.exe --gtest_output=xml:gtest.xml
           ${{github.workspace}}\temp\OpenCppCoverage\OpenCppCoverage.exe --cover_children --optimized_build --modules ${{github.workspace}} --sources ${{github.workspace}} --input_coverage=gtest.cov --export_type=cobertura:cobertura.xml -- python ${{github.workspace}}\tests\crypt_prog_tests.py ${{github.workspace}}\win_build\Build\x64\${{matrix.configuration}}\crypt_prog.exe
 
       - name: Verify MSI file
-        if: success() && matrix.type == 'msbuild' && !startsWith(github.ref, 'refs/tags/')
+        if: success() && !startsWith(github.ref, 'refs/tags/') && matrix.configuration == 'Release'
         run: python ./tests/msi_validation.py "C:\Program Files (x86)\MsiVal2\MsiVal2.exe" "${{github.workspace}}\win_build\Build\${{matrix.platform}}\${{matrix.configuration}}\boinc.msi" "${{github.workspace}}\installer\darice.cub"
 
       - name: Run installation
-        if: success() && matrix.platform == 'x64' && matrix.type == 'msbuild'
+        if: success() && matrix.platform == 'x64' && matrix.configuration == 'Release'
         shell: powershell
         run: Start-Process "msiexec.exe" -ArgumentList "/i ${{github.workspace}}\win_build\Build\x64\${{matrix.configuration}}\boinc.msi /quiet /qn /l*v ${{github.workspace}}\win_build\Build\x64\${{matrix.configuration}}\install.log" -Wait
 
       - name: Run installation tests
-        if: success() && matrix.platform == 'x64' && matrix.type == 'msbuild'
+        if: success() && matrix.platform == 'x64' && matrix.configuration == 'Release'
         run: python ./tests/windows_installer_integration_tests.py
 
       - name: Prepare logs on failure
@@ -159,11 +154,11 @@ jobs:
         if: ${{failure()}}
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
-          name: windows_logs_${{matrix.type}}_${{matrix.platform}}_${{github.event.pull_request.head.sha}}
+          name: windows_logs_msbuild_${{matrix.platform}}_${{matrix.configuration}}_${{github.event.pull_request.head.sha}}
           path: deploy/logs.7z
 
       - name: Prepare artifacts for deploy
-        if: success() && matrix.type == 'msbuild'
+        if: success() && matrix.configuration == 'Release'
         shell: cmd
         run: |
           python deploy\prepare_deployment.py win_apps
@@ -172,49 +167,95 @@ jobs:
           python deploy\prepare_deployment.py win_installer
 
       - name: Upload apps
-        if: success() && matrix.type == 'msbuild'
+        if: success() && matrix.configuration == 'Release'
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: win_apps_${{matrix.platform}}_${{github.event.pull_request.head.sha}}
           path: deploy/win_apps.7z
 
       - name: Upload client
-        if: success() && matrix.type == 'msbuild'
+        if: success() && matrix.configuration == 'Release'
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: win_client_${{matrix.platform}}_${{github.event.pull_request.head.sha}}
           path: deploy/win_client.7z
 
       - name: Upload manager
-        if: success() && matrix.type == 'msbuild'
+        if: success() && matrix.configuration == 'Release'
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: win_manager_${{matrix.platform}}_${{github.event.pull_request.head.sha}}
           path: deploy/win_manager.7z
 
       - name: Upload installer files
-        if: success() && matrix.type == 'msbuild'
+        if: success() && matrix.configuration == 'Release'
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: win_installer_${{matrix.platform}}_${{github.event.pull_request.head.sha}}
           path: deploy/win_installer.7z
 
       - name: Upload symbol files
-        if: success() && matrix.type == 'msbuild'
+        if: success() && matrix.configuration == 'Release'
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: win_pdb_${{matrix.platform}}_${{github.event.pull_request.head.sha}}
           path: win_build/Build/${{matrix.platform}}/${{matrix.configuration}}/*.pdb
 
       - name: Upload Google Tests Results
-        if: always() && matrix.platform == 'x64' && matrix.type == 'msbuild'
+        if: always() && matrix.platform == 'x64' && matrix.configuration == 'Release'
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: Windows_tests_results
           path: "win_build/Build/${{matrix.platform}}/${{matrix.configuration}}/**/gtest.xml"
 
       - name: Upload coverage report
-        if: success() && matrix.platform == 'x64' && matrix.type == 'msbuild'
+        if: success() && matrix.platform == 'x64' && matrix.configuration == 'Release'
         uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  cmake:
+    name: ${{matrix.configuration}}-${{matrix.platform}}-cmake
+    runs-on: windows-2022
+    strategy:
+      matrix:
+        platform: [x64, arm64]
+        configuration: [Release, Debug]
+      fail-fast: false
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        with:
+          fetch-depth: 2
+
+      - name: Setup msbuild
+        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce
+
+      - name: Check if build is running from origin repo
+        if: ${{success() && env.AWS_ACCESS_KEY_ID != 0 && env.AWS_SECRET_ACCESS_KEY != 0}}
+        run: |
+          echo "VCPKG_BINARY_SOURCES=clear;x-aws,s3://vcpkg.cache.boinc/,readwrite" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+
+      - name: Check if build is running from fork
+        if: ${{success() && (env.AWS_ACCESS_KEY_ID == 0 || env.AWS_SECRET_ACCESS_KEY == 0)}}
+        run: |
+          echo "VCPKG_BINARY_SOURCES=clear;x-aws-config,no-sign-request;x-aws,s3://vcpkg.cache.boinc/,read" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+
+      - name: Fix vcpkg
+        run: vcpkg.exe integrate remove
+
+      - name: Build
+        if: success()
+        run: windows\ci_build_libs_cmake.bat ${{matrix.platform}} ${{matrix.configuration}}
+
+      - name: Prepare logs on failure
+        if: ${{failure()}}
+        run: |
+          python ./deploy/prepare_deployment.py logs
+
+      - name: Upload logs on failure
+        if: ${{failure()}}
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
+        with:
+          name: windows_logs_cmake_${{matrix.platform}}_${{matrix.configuration}}_${{github.event.pull_request.head.sha}}
+          path: deploy/logs.7z
diff --git a/3rdParty/vcpkg_ports/triplets/ci/arm64-windows-static.cmake b/3rdParty/vcpkg_ports/triplets/ci/arm64-windows-static.cmake
@@ -16,5 +16,3 @@
 # along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 include(${CMAKE_CURRENT_LIST_DIR}/../default/arm64-windows-static.cmake)
-
-set(VCPKG_BUILD_TYPE release)
diff --git a/3rdParty/vcpkg_ports/triplets/ci/x64-windows-static.cmake b/3rdParty/vcpkg_ports/triplets/ci/x64-windows-static.cmake
@@ -16,5 +16,3 @@
 # along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 include(${CMAKE_CURRENT_LIST_DIR}/../default/x64-windows-static.cmake)
-
-set(VCPKG_BUILD_TYPE release)
