[Mac build] Add build_tools to the Mac build

Steelskin · compnerd · web-flow · commit 2c6c03db167f · 2024-09-04T09:16:27.000-07:00
Co-authored-by: Saleem Abdulrasool &lt;compnerd@compnerd.org&gt;
diff --git a/.github/workflows/build-toolchain.yml b/.github/workflows/build-toolchain.yml
@@ -152,7 +152,9 @@ jobs:
       windows_compilers_runner: ${{ steps.context.outputs.windows_compilers_runner }}
       mac_build_runner: ${{ steps.context.outputs.mac_build_runner }}
       windows_host_matrix: ${{ steps.setup-matrix.outputs.windows_host_matrix }}
+      windows_build_matrix: ${{ steps.setup-matrix.outputs.windows_build_matrix }}
       darwin_host_matrix: ${{ steps.setup-matrix.outputs.darwin_host_matrix }}
+      darwin_build_matrix: ${{ steps.setup-matrix.outputs.darwin_build_matrix }}
     steps:
       - id: context
         name: Generate Build Context
@@ -307,6 +309,19 @@ jobs:
                 }
               ]
             }
+          WINDOWS_BUILD_MATRIX: >-
+            {
+              "include": [
+                {
+                  "arch": "amd64",
+                  "os": "Windows",
+                  "cc": "cl",
+                  "ccflags": "${{ steps.context.outputs.WINDOWS_CMAKE_C_FLAGS }}",
+                  "cxx": "cl",
+                  "cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}"
+                }
+              ]
+            }
           DARWIN_HOST_MATRIX: >-
             {
               "include": [
@@ -328,9 +343,24 @@ jobs:
                 }
               ]
             }
+          DARWIN_BUILD_MATRIX: >-
+            {
+              "include": [
+                {
+                  "arch": "aarch64",
+                  "os": "Darwin",
+                  "cc": "clang",
+                  "ccflags": "${{ steps.context.outputs.DARWIN_CMAKE_C_FLAGS }}",
+                  "cxx": "clang++",
+                  "cxxflags": "${{ steps.context.outputs.DARWIN_CMAKE_CXX_FLAGS }}"
+                }
+              ]
+            }
         run: |
           echo "windows_host_matrix=$(jq -r -c '.' <<< ${WINDOWS_HOST_MATRIX})" >> ${GITHUB_OUTPUT}
+          echo "windows_build_matrix=$(jq -r -c '.' <<< ${WINDOWS_BUILD_MATRIX})" >> ${GITHUB_OUTPUT}
           echo "darwin_host_matrix=$(jq -r -c '.' <<< ${DARWIN_HOST_MATRIX})" >> ${GITHUB_OUTPUT}
+          echo "darwin_build_matrix=$(jq -r -c '.' <<< ${DARWIN_BUILD_MATRIX})" >> ${GITHUB_OUTPUT}
 
   windows-build:
     needs: [context]
@@ -339,6 +369,8 @@ jobs:
     with:
       build_os: Windows
       build_arch: amd64
+      build_matrix: ${{ needs.context.outputs.windows_build_matrix }}
+      host_matrix: ${{ needs.context.outputs.windows_host_matrix }}
       curl_revision: ${{ needs.context.outputs.curl_revision }}
       ds2_revision: ${{ needs.context.outputs.ds2_revision }}
       indexstore_db_revision: ${{ needs.context.outputs.indexstore_db_revision }}
@@ -391,7 +423,6 @@ jobs:
       swift_tag: ${{ needs.context.outputs.swift_tag }}
       default_build_runner: ${{ needs.context.outputs.windows_build_runner }}
       compilers_build_runner: ${{ needs.context.outputs.windows_compilers_runner }}
-      host_matrix: ${{ needs.context.outputs.windows_host_matrix }}
     secrets:
       SYMBOL_SERVER_PAT: ${{ secrets.SYMBOL_SERVER_PAT }}
       CERTIFICATE: ${{ secrets.CERTIFICATE }}
@@ -406,6 +437,8 @@ jobs:
     with:
       build_os: Darwin
       build_arch: aarch64
+      build_matrix: ${{ needs.context.outputs.darwin_build_matrix }}
+      host_matrix: ${{ needs.context.outputs.darwin_host_matrix }}
       curl_revision: ${{ needs.context.outputs.curl_revision }}
       ds2_revision: ${{ needs.context.outputs.ds2_revision }}
       indexstore_db_revision: ${{ needs.context.outputs.indexstore_db_revision }}
@@ -458,7 +491,6 @@ jobs:
       swift_tag: ${{ needs.context.outputs.swift_tag }}
       default_build_runner: ${{ needs.context.outputs.mac_build_runner }}
       compilers_build_runner: ${{ needs.context.outputs.mac_build_runner }}
-      host_matrix: ${{ needs.context.outputs.darwin_host_matrix }}
     secrets:
       SYMBOL_SERVER_PAT: ${{ secrets.SYMBOL_SERVER_PAT }}
       CERTIFICATE: ${{ secrets.CERTIFICATE }}
diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml
@@ -11,6 +11,10 @@ on:
         required: true
         type: string
 
+      build_matrix:
+        required: true
+        type: string
+
       host_matrix:
         required: true
         type: string
@@ -541,17 +545,19 @@ jobs:
           path: ${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
 
   build_tools:
-    # TODO: Build this on macOS or make an equivalent Mac-only job
-    if: inputs.build_os == 'Windows'
     needs: [cmark_gfm]
     runs-on: ${{ inputs.default_build_runner }}
 
-    name: Windows amd64 Compiler Build Tools
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJSON(inputs.build_matrix) }}
+
+    name: ${{ matrix.os }} ${{ matrix.arch }} Compiler Build Tools
 
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: cmark-gfm-Windows-amd64-${{ inputs.swift_cmark_version }}
+          name: cmark-gfm-${{ matrix.os }}-${{ matrix.arch }}-${{ inputs.swift_cmark_version }}
           path: ${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
 
       - uses: actions/checkout@v4
@@ -569,9 +575,11 @@ jobs:
 
       - uses: compnerd/gha-setup-vsdevenv@main
 
+      - uses: seanmiddleditch/gha-setup-ninja@master
+        if: inputs.build_os == 'Darwin'
+
       - name: Compute workspace hash
         id: workspace_hash
-        shell: pwsh
         run: |
           $stringAsStream = [System.IO.MemoryStream]::new()
           $writer = [System.IO.StreamWriter]::new($stringAsStream)
@@ -585,19 +593,19 @@ jobs:
         uses: hendrikmuhs/ccache-action@2e0e89e8d74340a03f75d58d02aae4c5ee1b15c6
         with:
           max-size: 100M
-          key: ${{ steps.workspace_hash.outputs.hash }}-windows-amd64-build_tools
+          key: ${{ steps.workspace_hash.outputs.hash }}-${{ matrix.os }}-${{ matrix.arch }}-build_tools
           variant: sccache
 
       - name: Configure Tools
         run: |
           cmake -B ${{ github.workspace }}/BinaryCache/0 `
                 -D CMAKE_BUILD_TYPE=Release `
-                -D CMAKE_C_COMPILER=cl `
+                -D CMAKE_C_COMPILER=${{ matrix.cc }} `
                 -D CMAKE_C_COMPILER_LAUNCHER=sccache `
-                -D CMAKE_C_FLAGS="${{ inputs.WINDOWS_CMAKE_C_FLAGS }}" `
-                -D CMAKE_CXX_COMPILER=cl `
+                -D CMAKE_C_FLAGS="${{ matrix.cflags }}" `
+                -D CMAKE_CXX_COMPILER=${{ matrix.cxx }} `
                 -D CMAKE_CXX_COMPILER_LAUNCHER=sccache `
-                -D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
+                -D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
                 -D CMAKE_MT=mt `
                 -D cmark-gfm_DIR=${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/lib/cmake `
                 -G Ninja `
@@ -644,19 +652,33 @@ jobs:
       - name: Build swift-compatibility-symbols
         run: cmake --build ${{ github.workspace }}/BinaryCache/0 --target swift-compatibility-symbols
 
+      - name: Export binary paths
+        id: export-binary-paths
+        run: |
+          $Suffix = if ( "${{ matrix.os }}" -eq "Windows" ) { ".exe" } else { "" }
+          echo "llvm_tblgen=${{ github.workspace }}/BinaryCache/0/bin/llvm-tblgen${Suffix}" >> $env:GITHUB_OUTPUT
+          echo "clang_tblgen=${{ github.workspace }}/BinaryCache/0/bin/clang-tblgen${Suffix}" >> $env:GITHUB_OUTPUT
+          echo "lldb_tblgen=${{ github.workspace }}/BinaryCache/0/bin/lldb-tblgen${Suffix}" >> $env:GITHUB_OUTPUT
+          echo "llvm_config=${{ github.workspace }}/BinaryCache/0/bin/llvm-config${Suffix}" >> $env:GITHUB_OUTPUT
+          echo "clang_pseudo_gen=${{ github.workspace }}/BinaryCache/0/bin/clang-pseudo-gen${Suffix}" >> $env:GITHUB_OUTPUT
+          echo "clang_tidy_confusable_chars_gen=${{ github.workspace }}/BinaryCache/0/bin/clang-tidy-confusable-chars-gen${Suffix}" >> $env:GITHUB_OUTPUT
+          echo "swift_def_to_strings_converter=${{ github.workspace }}/BinaryCache/0/bin/swift-def-to-strings-converter${Suffix}" >> $env:GITHUB_OUTPUT
+          echo "swift_serialize_diagnostics=${{ github.workspace }}/BinaryCache/0/bin/swift-serialize-diagnostics${Suffix}" >> $env:GITHUB_OUTPUT
+          echo "swift_compatibility_symbols=${{ github.workspace }}/BinaryCache/0/bin/swift-compatibility-symbols${Suffix}" >> $env:GITHUB_OUTPUT
+
       - uses: actions/upload-artifact@v4
         with:
-          name: build-tools
+          name: build-tools-${{ matrix.os }}
           path: |
-            ${{ github.workspace }}/BinaryCache/0/bin/llvm-tblgen.exe
-            ${{ github.workspace }}/BinaryCache/0/bin/clang-tblgen.exe
-            ${{ github.workspace }}/BinaryCache/0/bin/lldb-tblgen.exe
-            ${{ github.workspace }}/BinaryCache/0/bin/llvm-config.exe
-            ${{ github.workspace }}/BinaryCache/0/bin/clang-pseudo-gen.exe
-            ${{ github.workspace }}/BinaryCache/0/bin/clang-tidy-confusable-chars-gen.exe
-            ${{ github.workspace }}/BinaryCache/0/bin/swift-def-to-strings-converter.exe
-            ${{ github.workspace }}/BinaryCache/0/bin/swift-serialize-diagnostics.exe
-            ${{ github.workspace }}/BinaryCache/0/bin/swift-compatibility-symbols.exe
+            ${{ steps.export-binary-paths.outputs.llvm_tblgen }}
+            ${{ steps.export-binary-paths.outputs.clang_tblgen }}
+            ${{ steps.export-binary-paths.outputs.lldb_tblgen }}
+            ${{ steps.export-binary-paths.outputs.llvm_config }}
+            ${{ steps.export-binary-paths.outputs.clang_pseudo_gen }}
+            ${{ steps.export-binary-paths.outputs.clang_tidy_confusable_chars_gen }}
+            ${{ steps.export-binary-paths.outputs.swift_def_to_strings_converter }}
+            ${{ steps.export-binary-paths.outputs.swift_serialize_diagnostics }}
+            ${{ steps.export-binary-paths.outputs.swift_compatibility_symbols }}
 
   compilers:
     # TODO: Build this on macOS or make an equivalent Mac-only job
@@ -685,7 +707,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: build-tools
+          name: build-tools-Windows
           path: ${{ github.workspace }}/BinaryCache/0/bin
       - uses: actions/download-artifact@v4
         with:
