ci: added custom swiftorg website commit testing (#390)

* ci: added custom swiftorg website commit testing

* fix: added swift 6.x gpg recovery key

Author: soumyamahunt

.github/workflows/main.yml

@@ -8,6 +8,10 @@ on:
     - cron: '0 0 * * *'
   workflow_dispatch:
     inputs:
+      swiftorg:
+        description: Swiftorg commit
+        required: false
+        type: string
       release:
         description: Create release?
         required: false
@@ -63,7 +67,7 @@ jobs:
     - name: Setup npm pacakges
       run: npm install --legacy-peer-deps
       env:
-        SETUPSWIFT_SWIFTORG_METADATA: ${{ github.event_name == 'schedule' && '{"commit":"HEAD"}' }}
+        SETUPSWIFT_SWIFTORG_METADATA: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.swiftorg != '' && format('{"commit":"{0}}"}',  github.event.inputs.swiftorg) || github.event_name == 'workflow_dispatch' && github.event.inputs.swiftorg == 'true' || github.event_name == 'schedule' && '{"commit":"HEAD"}' }}
 
     - name: Check latest swift.org
       id: swift-org

README.md

@@ -10,7 +10,7 @@
 [GitHub Action](https://github.com/features/actions) that will setup [Swift](https://swift.org) environment with specified version.
 This action supports the following functionalities:
 
-- Works on Linux, macOS and Windows.
+- Works on Linux, macOS and Windows across all architectures.
 - Supports [installing latest major/minor/patch](#specifying-version).
 - Provides snapshots as soon as published in `swift.org`.
 - Verifies toolchain snapshots before installation (`gpg` for Linux and Windows, `pkgutil` for macOS) .

dist/index.js

@@ -30,8 +30,20 @@ export class WindowsToolchainInstaller extends VerifyingToolchainInstaller<Windo
       )
     })
 
+    let compArch: string
+    switch (arch) {
+      case 'arm64':
+      case 'arm':
+      case 'arm64ec':
+        compArch = arch.toUpperCase()
+        break
+      default:
+        compArch = 'x86.x64'
+        break
+    }
+
     const vsComponents = [
-      `Microsoft.VisualStudio.Component.VC.Tools.${arch == 'arm64' ? 'ARM64' : 'x86.x64'}`,
+      `Microsoft.VisualStudio.Component.VC.Tools.${compArch}`,
       ...providedComponents
     ]
     if (!winsdkComponent) {

src/installer/windows/index.ts

@@ -15,6 +15,7 @@ export async function setupKeys() {
       '--keyserver',
       'hkp://keyserver.ubuntu.com',
       '--recv-keys',
+      '52BB 7E3D E28A 71BE 22EC  05FF EF80 A866 B47A 981F',
       '7463 A81A 4B2E EA1B 551F  FBCF D441 C977 412B 37AD',
       '1BE1 E29A 084C B305 F397  D62A 9F59 7F4D 21A5 6D5F',
       'A3BA FD35 56A5 9079 C068  94BD 63BC 1CFE 91D3 06C6',