Simplify more previous build works

Author: tstellar

.github/workflows/release-binaries-setup-stage/action.yml

@@ -30,6 +30,13 @@ runs:
       with:
         arch: amd64
 
+    # In order to avoid some errors with long paths names, we need to shorten
+    # the path names for the build.
+    - name: Shorten paths on Windows
+      if: startsWith(runner.os, 'Windows')
+      run: |
+        subst S: ${{ github.workspace }}
+
     - name: Set Build Prefix
       id: build-prefix
       shell: bash
@@ -38,6 +45,8 @@ runs:
         if [ "${{ runner.os }}" = "Linux" ]; then
           sudo chown $USER:$USER /mnt/
           build_prefix=/mnt/
+        elif [ "${{ runner.os }}" = "Windows" ]; then
+          build_prefix=/s/
         fi
         echo "build-prefix=$build_prefix" >> $GITHUB_OUTPUT
 

.github/workflows/release-binaries.yml

@@ -236,39 +236,33 @@ jobs:
       id: setup-stage
       uses: ./workflows-main/.github/workflows/release-binaries-setup-stage
 
+    # We will use Wix to generate the installer on Windows, because this supports
+    # installers > 2GB.
     - name: Install Wix
+      if: runner.os == 'Windows'
       run: |
         dotnet tool install --global wix
     - name: Configure
       id: build
+      shell: bash
       env:
         CCACHE_BIN: ${{ needs.prepare.outputs.ccache }}
-        CMAKE: /c/Android/android-sdk/cmake/3.31.5/bin/cmake.exe
       run: |
         # There were some issues on the ARM64 MacOS runners with trying to build x86 object,
         # so we need to set some extra cmake flags to disable this.
-        #export PATH=C:\Strawberry\c\bin\:$PATH
-        subst S: ${{ github.workspace }}
-        cmake -G Ninja -S S:\llvm -B S:\build `
-            ${{ needs.prepare.outputs.target-cmake-flags }} `
-            -C clang\cmake\caches\Release.cmake `
-            -DBOOTSTRAP_BOOTSTRAP_CPACK_GENERATOR=WIX `
+        cmake -G Ninja -S llvm -B ${{ steps.setup-stage.outputs.build-prefix }}/build \
+            ${{ needs.prepare.outputs.target-cmake-flags }} \
+            -C clang/cmake/caches/Release.cmake \
+            -DBOOTSTRAP_LLVM_PARALLEL_LINK_JOBS=1 \
             -DBOOTSTRAP_BOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}"
 
-    - name: Build Unix
+    - name: Build
       shell: bash
       run: |
-        ninja -v -C /s/build stage2-package
-        release_dir=`find /s/build -iname 'stage2-bins'`
+        ninja -v -C ${{ steps.setup-stage.outputs.build-prefix }}/build stage2-package
+        release_dir=`find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname 'stage2-bins'`
         mv $release_dir/${{ needs.prepare.outputs.release-binary-filename }} .
-
-    # There is an issue with building on Windows with bash so we use power shell.
-    # ninja: error: mkdir(tools/clang/tools/extra/clang-tidy/misc/ConfusableTable/CMakeFiles/clang-tidy-confusable-chars-gen.dir/C_/actions-runner/llvm-project/llvm-project/llvm): No such file or directory
-    #- name: Build Windows
-    #  if: runner.os == 'Windows'
-    #  run: |
-    #    ninja -v -C "S:\build" stage2-package
-
+    
     - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: ${{ runner.os }}-${{ runner.arch }}-release-binary

clang/cmake/caches/Release.cmake

@@ -148,7 +148,9 @@ if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux")
   set_final_stage_var(CLANG_BOLT "INSTRUMENT" STRING)
 endif()
 # We want to generate an installer on Windows.
-if(NOT ${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
+if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
+  set_final_stage_var(CPACK_GENERATOR "WIX" STRING)
+else()
   set_final_stage_var(CPACK_GENERATOR "TXZ" STRING)
 endif()
 if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")