Add support for building the online flavor of the installer

Author: mhegazy

.github/workflows/build-toolchain.yml

@@ -145,7 +145,12 @@ on:
         required: true
       PASSPHRASE:
         required: true
-
+      R2_ACCOUNT_ID:
+        required: true
+      R2_ACCESS_KEY_ID:
+        required: true
+      R2_SECRET_ACCESS_KEY:
+        required: true
 
 jobs:
   context:
@@ -871,6 +876,9 @@ jobs:
       SYMBOL_SERVER_PAT: ${{ secrets.SYMBOL_SERVER_PAT }}
       CERTIFICATE: ${{ secrets.CERTIFICATE }}
       PASSPHRASE: ${{ secrets.PASSPHRASE }}
+      R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
+      R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+      R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
 
   mac-build:
     # TODO: Enable the mac build.
@@ -955,6 +963,9 @@ jobs:
       SYMBOL_SERVER_PAT: ${{ secrets.SYMBOL_SERVER_PAT }}
       CERTIFICATE: ${{ secrets.CERTIFICATE }}
       PASSPHRASE: ${{ secrets.PASSPHRASE }}
+      R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
+      R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+      R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
 
   snapshot:
     runs-on: ubuntu-latest
@@ -998,6 +1009,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          # TODO: Upload the offline installer as well.
           branch_version_string=${{ inputs.swift_version || '0.0.0' }}
           if [[ $branch_version_string == "0.0.0" ]]; then
             latest="true"

.github/workflows/swift-toolchain.yml

@@ -283,6 +283,12 @@ on:
         required: true
       PASSPHRASE:
         required: true
+      R2_ACCOUNT_ID:
+        required: true
+      R2_ACCESS_KEY_ID:
+        required: true
+      R2_SECRET_ACCESS_KEY:
+        required: true
 
 env:
   PINNED_BOOTSTRAP_TOOLCHAIN_VERSION: 6.1.2
@@ -2169,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
@@ -5068,7 +5074,7 @@ jobs:
               -p:ProductVersion=${{ inputs.swift_version }}-${{ inputs.swift_tag }} `
               ${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/shared/shared.wixproj
 
-      - name: Build installer bundle
+      - name: Build installer bundle (offline)
         run: |
           $Platforms=@("windows")
           if ("${{ inputs.build_android }}" -eq "true") {
@@ -5091,16 +5097,93 @@ jobs:
               -p:ToolchainVariants="`"asserts;noasserts`"" `
               ${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/bundle/installer.wixproj
 
-      - if: ${{ inputs.release }}
+      - name: Generate Build Provenance (offline installer)
+        if: ${{ inputs.release }}
         uses: actions/attest-build-provenance@v2
         with:
           subject-path: ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/installer.exe
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload installer (offline)
+        uses: actions/upload-artifact@v4
+        with:
+          name: Windows-${{ matrix.arch }}-installer-offline
+          path: ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/installer.exe
+    
+      - name: Generate online installer download URL
+        if: ${{ inputs.release }}
+        id: generate-base-release-download-prefix
+        run: |
+          $BaseReleaseDownloadUrlPrefix = "${{ inputs.swift_tag }}/${{ matrix.arch }}/${{ github.run_id }}"
+          echo "url_prefix=$BaseReleaseDownloadUrlPrefix" >> $env:GITHUB_OUTPUT
+
+      - name: Build installer bundle (online)
+        if: ${{ inputs.release }}
+        run: |
+          $Platforms=@("windows")
+          if ("${{ inputs.build_android }}" -eq "true") {
+            $Platforms=@("android") + $Platforms
+          }
+          $BaseReleaseDownloadUrl = "https://pub-3a06d9ae9ab6469198a3cf59c7d6bdce.r2.dev/${{ steps.generate-base-release-download-prefix.outputs.url_prefix }}"
+
+          msbuild -nologo -restore -maxCpuCount `
+              /t:rebuild `
+              -p:BaseOutputPath=${{ github.workspace }}\BinaryCache\installer\ `
+              -p:Configuration=Release `
+              -p:BuildProjectReferences=false `
+              -p:SignOutput=${{ inputs.signed }} `
+              -p:CERTIFICATE=${env:CERTIFICATE} `
+              -p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
+              -p:BundleFlavor=online `
+              -p:BaseReleaseDownloadUrl=`"$BaseReleaseDownloadUrl`" `
+              -p:Platforms="`"$($Platforms -Join ';')`"" `
+              -p:AndroidArchitectures="`"aarch64;armv7;i686;x86_64`"" `
+              -p:WindowsArchitectures="`"aarch64;i686;x86_64`"" `
+              -p:ProductArchitecture=${{ matrix.arch }} `
+              -p:ProductVersion=${{ inputs.swift_version }}-${{ inputs.swift_tag }} `
+              -p:ToolchainVariants="`"asserts;noasserts`"" `
+              ${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/bundle/installer.wixproj
+
+      - name: Prepare layout for upload
+        id: prepare-layout
+        if: ${{ inputs.release }}
+        run: |
+          # Create the target folder.
+          $SourceDir = "${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}"
+          $LayoutDir = "${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/layout"
+          New-Item -ItemType Directory -Path $LayoutDir -Force | Out-Null
+
+          # Copy all .txt files from src to the filtered directory
+          Copy-Item -Path "$SourceDir/installer.exe" -Destination "$LayoutDir" -Force
+          Copy-Item -Path "$SourceDir/*.cab" -Destination "$LayoutDir" -Force
+          Copy-Item -Path "$SourceDir/*.msi" -Destination "$LayoutDir" -Force
+
+          echo "LayoutDir=$LayoutDir"
+          echo "LayoutDir=$LayoutDir" >> $env:GITHUB_OUTPUT
+
+      - name: Generate Build Provenance (online installer)
+        if: ${{ inputs.release }}
+        uses: actions/attest-build-provenance@v2
+        with:
+          subject-path: ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/installer.exe
+
+      - name: Upload installer (online)
+        if: ${{ inputs.release }}
+        uses: actions/upload-artifact@v4
         with:
           name: Windows-${{ matrix.arch }}-installer
           path: ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/installer.exe
 
+      - name: Upload msi's and cab's 
+        if: ${{ inputs.release }}
+        uses: ryand56/r2-upload-action@b801a390acbdeb034c5e684ff5e1361c06639e7c # v1.4
+        with:
+          r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
+          r2-access-key-id: ${{ secrets.R2_ACCESS_KEY_ID }}
+          r2-secret-access-key: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          r2-bucket: swift-toolchain
+          source-dir: ${{ steps.prepare-layout.outputs.LayoutDir }}
+          destination-dir: ${{ steps.generate-base-release-download-prefix.outputs.url_prefix }}
+
   smoke_test:
     # TODO: Build this on macOS or make an equivalent Mac-only job
     if: inputs.build_os == 'Windows'
@@ -5110,7 +5193,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: Windows-${{ inputs.build_arch }}-installer
+          name: Windows-${{ inputs.build_arch }}-installer-offline
           path: ${{ github.workspace }}/tmp
 
       # TODO(compnerd): migrate this to compnerd/gha-setup-swift after the work that @mangini is doing is completed
@@ -5175,7 +5258,7 @@ jobs:
       - name: Download Swift SDK
         uses: actions/download-artifact@v4
         with:
-          name: Windows-${{ inputs.build_arch }}-installer
+          name: Windows-${{ inputs.build_arch }}-installer-offline
           path: ${{ github.workspace }}/tmp
 
       # TODO(compnerd): migrate this to compnerd/gha-setup-swift after the work that @mangini is doing is completed