Switch back to online installer for smoke tests (#1034)

* Revert "Use offline installer for smoke tests"

This reverts commit d89a917.

* Add a Sleep step

* Move things around

Author: mhegazy

.github/workflows/swift-toolchain.yml

@@ -5178,10 +5178,17 @@ jobs:
     runs-on: ${{ inputs.default_build_runner }}
 
     steps:
-      - name: Download Swift SDK Installer (offline)
+      - uses: actions/[email protected]
+        with:
+          repository: compnerd/swift-win32
+          ref: refs/heads/main
+          path: ${{ github.workspace }}/SourceCache/swift-win32
+          show-progress: false
+
+      - 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
@@ -5218,13 +5225,6 @@ jobs:
           echo "$env:Path" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
           Get-ChildItem Env: | % { echo "$($_.Name)=$($_.Value)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append }
 
-      - uses: actions/[email protected]
-        with:
-          repository: compnerd/swift-win32
-          ref: refs/heads/main
-          path: ${{ github.workspace }}/SourceCache/swift-win32
-          show-progress: false
-
       - run: swift build
         working-directory: ${{ github.workspace }}/SourceCache/swift-win32
 
@@ -5295,10 +5295,24 @@ jobs:
         arch: [ x86_64, aarch64 ]
 
     steps:
-      - name: Download Swift SDK Installer (offline)
+      - name: Checkout cassowary project
+        uses: actions/[email protected]
+        with:
+          repository: compnerd/cassowary
+          ref: 0.0.2
+          path: ${{ github.workspace }}/SourceCache/cassowary
+
+      - name: Install Android NDK
+        uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: ${{ inputs.ANDROID_NDK_VERSION }}
+          local-cache: true
+
+      - 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
@@ -5336,27 +5350,13 @@ jobs:
           echo "$env:Path" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
           Get-ChildItem Env: | % { echo "$($_.Name)=$($_.Value)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append }
 
-      - name: Install Android NDK
-        uses: nttld/setup-ndk@v1
-        id: setup-ndk
-        with:
-          ndk-version: ${{ inputs.ANDROID_NDK_VERSION }}
-          local-cache: true
-
       - name: Setup Swift environment
         id: android-swift-env
         run: |
           echo "sysroot=$(resolve-path ${{ steps.setup-ndk.outputs.ndk-path }}\toolchains\llvm\prebuilt\windows-x86_64\sysroot)" >> $env:GITHUB_OUTPUT
           echo "sdkroot=$(resolve-path $env:SDKROOT\..\..\..\..\Android.platform\Developer\SDKs\Android.sdk)" >> $env:GITHUB_OUTPUT
           echo "clang-resource-dir=$(& $(resolve-path "${{ steps.setup-ndk.outputs.ndk-path }}\toolchains\llvm\prebuilt\windows-x86_64\bin\clang.exe") -print-resource-dir)" >> $env:GITHUB_OUTPUT
 
-      - name: Checkout cassowary project
-        uses: actions/[email protected]
-        with:
-          repository: compnerd/cassowary
-          ref: 0.0.2
-          path: ${{ github.workspace }}/SourceCache/cassowary
-
       - name: Build cassowary project
         run: |
           swift build `