if: matrix.os != 'Android' || inputs.build_android

Author: mhegazy

.github/workflows/build-toolchain.yml

@@ -997,14 +997,24 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: Windows-amd64-installer
-          path: ${{ github.workspace }}/tmp/amd64
+          name: Windows-amd64-installer-online
+          path: ${{ github.workspace }}/tmp/online/amd64
 
       - uses: actions/download-artifact@v4
         with:
-          name: Windows-arm64-installer
-          path: ${{ github.workspace }}/tmp/arm64
+          name: Windows-arm64-installer-online
+          path: ${{ github.workspace }}/tmp/online/arm64
+      
+      - uses: actions/download-artifact@v4
+        with:
+          name: Windows-amd64-installer-offline
+          path: ${{ github.workspace }}/tmp/offline/amd64
 
+      - uses: actions/download-artifact@v4
+        with:
+          name: Windows-arm64-installer-offline
+          path: ${{ github.workspace }}/tmp/offline/arm64
+    
       - name: Create Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1020,7 +1030,7 @@ jobs:
           gh release create ${{ needs.context.outputs.swift_tag }} -R ${{ github.repository }} --latest=${latest}
 
           # AMD64
-          cd ${{ github.workspace }}/tmp/amd64
+          cd ${{ github.workspace }}/tmp/online/amd64
 
           mv installer.exe installer-amd64.exe
           gh release upload ${{ needs.context.outputs.swift_tag }} installer-amd64.exe -R ${{ github.repository }}
@@ -1029,10 +1039,42 @@ jobs:
           gh release upload ${{ needs.context.outputs.swift_tag }} installer-amd64.exe.sha256 -R ${{ github.repository }}
 
           # ARM64
-          cd ${{ github.workspace }}/tmp/arm64
+          cd ${{ github.workspace }}/tmp/online/arm64
 
           mv installer.exe installer-arm64.exe
           gh release upload ${{ needs.context.outputs.swift_tag }} installer-arm64.exe -R ${{ github.repository }}
 
           shasum -a 256 installer-arm64.exe > installer-arm64.exe.sha256
           gh release upload ${{ needs.context.outputs.swift_tag }} installer-arm64.exe.sha256 -R ${{ github.repository }}
+
+          # AMD64
+          cd ${{ github.workspace }}/tmp/offline/amd64
+
+          mv installer.exe installer-offline-amd64.exe
+          gh release upload ${{ needs.context.outputs.swift_tag }} installer-offline-amd64.exe -R ${{ github.repository }}
+
+          shasum -a 256 installer-offline-amd64.exe > installer-offline-amd64.exe.sha256
+          gh release upload ${{ needs.context.outputs.swift_tag }} installer-offline-amd64.exe.sha256 -R ${{ github.repository }}
+
+          # ARM64
+          cd ${{ github.workspace }}/tmp/offline/arm64
+
+          mv installer.exe installer-offline-arm64.exe
+          gh release upload ${{ needs.context.outputs.swift_tag }} installer-offline-arm64.exe -R ${{ github.repository }}
+
+          shasum -a 256 installer-offline-arm64.exe > installer-offline-arm64.exe.sha256
+          gh release upload ${{ needs.context.outputs.swift_tag }} installer-offline-arm64.exe.sha256 -R ${{ github.repository }}
+
+  binary-size:
+    needs: [context, release]
+    if: inputs.create_release == true
+    name: Record Swift Toolchain Binary Sizes
+    permissions:
+      contents: read
+      id-token: write
+    uses: ./.github/workflows/release-swift-toolchain-binary-sizes.yml
+    with:
+      toolchain_version: ${{ needs.context.outputs.swift_tag }}
+      dry_run: false
+    secrets:
+      SWIFT_TOOLCHAIN_UPLOADER_ROLE_ARN: ${{ secrets.SWIFT_TOOLCHAIN_UPLOADER_ROLE_ARN }}

.github/workflows/swift-toolchain.yml

@@ -2175,7 +2175,7 @@ jobs:
         run: |
           cd ${{ github.workspace }}/SourceCache/swift/Runtimes
           cmake -P Resync.cmake
-          
+
       - name: Configure Dispatch (C parts only)
         if: matrix.os != 'Android' || inputs.build_android
         uses: ./SourceCache/ci-build/.github/actions/configure-cmake-project
@@ -5170,7 +5170,7 @@ jobs:
         if: ${{ inputs.release }}
         uses: actions/upload-artifact@v4
         with:
-          name: Windows-${{ matrix.arch }}-installer
+          name: Windows-${{ matrix.arch }}-installer-online
           path: ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/installer.exe
 
       - name: Upload msi's and cab's 
@@ -5191,11 +5191,13 @@ jobs:
     runs-on: ${{ inputs.default_build_runner }}
 
     steps:
-      - uses: actions/download-artifact@v4
+      - name: Download Swift SDK Installer (${{ inputs.release && 'online' || 'offline' }})
+        uses: actions/download-artifact@v4
         with:
-          name: Windows-${{ inputs.build_arch }}-installer-offline
+          name: Windows-${{ inputs.build_arch }}-installer-${{ inputs.release && 'online' || 'offline' }}
           path: ${{ github.workspace }}/tmp
 
+
       # TODO(compnerd): migrate this to compnerd/gha-setup-swift after the work that @mangini is doing is completed
       - run: |
           function Update-EnvironmentVariables {
@@ -5255,12 +5257,12 @@ jobs:
         arch: [ x86_64, aarch64 ]
 
     steps:
-      - name: Download Swift SDK
+      - name: Download Swift SDK Installer (${{ inputs.release && 'online' || 'offline' }})
         uses: actions/download-artifact@v4
         with:
-          name: Windows-${{ inputs.build_arch }}-installer-offline
+          name: Windows-${{ inputs.build_arch }}-installer-${{ inputs.release && 'online' || 'offline' }}
           path: ${{ github.workspace }}/tmp
-
+    
       # TODO(compnerd): migrate this to compnerd/gha-setup-swift after the work that @mangini is doing is completed
       - name: Install Swift SDK
         run: |