Update android-ndk-windows-llvm-msvc-PDB.yml

backengineering · Jun 17, 2024 · 0135a75 · 0135a75
1 parent eb97dc0
commit 0135a75
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/.github/workflows/android-ndk-windows-llvm-msvc-PDB.yml b/.github/workflows/android-ndk-windows-llvm-msvc-PDB.yml
@@ -9,7 +9,11 @@ jobs:
   build:
     # Skip building pull requests from the same repository
     if: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) }}
-    runs-on: windows-2022
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-2022]
     env:
       BUILD_TYPE: RelWithDebInfo
     steps:
@@ -20,20 +24,10 @@ jobs:
           path: llvm-msvc
           submodules: 'recursive'
 
-    - name: Install vswhere
-      run: |
-        choco install vswhere --version 2.8.4 --force
-
-    - name: Setup MSVC
-      run: |
-        $vsPath = &vswhere -version 17.8.5 -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
-        echo "VSINSTALLDIR=$vsPath" >> $env:GITHUB_ENV
-        echo "PATH=$vsPath\VC\Tools\MSVC\14.34.31933\bin\Hostx64\x64;$env:PATH" >> $env:GITHUB_ENV
-        
     - name: Build llvm
       run: |
-        cmake -Bbuild -G "Visual Studio 17 2022" -A x64 `
-        -DHAVE_STD_IS_TRIVIALLY_COPYABLE=0 -DLLVM_TOOL_LLVM_SHLIB_BUILD=off `
+        cmake -Bbuild `
+        -DLLVM_ENABLE_PACK_PDB=ON `
         -DLLVM_INCLUDE_TESTS=OFF `
         -DLLVM_INCLUDE_EXAMPLES=OFF `
         -DLLDB_ENABLE_PYTHON=OFF `
@@ -45,8 +39,8 @@ jobs:
         -DLLVM_TARGETS_TO_BUILD="X86;AArch64" `
         -DLLVM_ENABLE_PROJECTS="clang;lld" `
         llvm-msvc\\llvm
-        cmake --build build --config ${{ env.BUILD_TYPE }} --verbose
-        cmake --build build --config ${{ env.BUILD_TYPE }} --target install --verbose
+        cmake --build build --config ${{ env.BUILD_TYPE }}
+        cmake --build build --config ${{ env.BUILD_TYPE }} --target install
         
     - name: Package ndk-26c
       run: |