From 63b7624aba9dc93c3e6cff341a9e84534793f890 Mon Sep 17 00:00:00 2001
From: Andreas Bauer <andreas.bauer@stanford.edu>
Date: Wed, 21 Feb 2024 12:01:43 -0800
Subject: [PATCH] Rename artifacts

---
 .github/workflows/build-and-test.yml | 40 +++++++++++++++-------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 0818914..dd23097 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -21,24 +21,25 @@ jobs:
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
       scheme: TemplatePackage
-      artifactname: TemplatePackage.xcresult
+      resultBundle: TemplatePackage-iOS.xcresult
+      artifactname: TemplatePackage-iOS.xcresult
   packagewatchos:
     name: Build and Test Swift Package watchOS
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
       scheme: TemplatePackage
-      resultBundle: TemplatePackageWatchOS.xcresult
       destination: 'platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)'
-      artifactname: TemplatePackageWatchOS.xcresult
+      resultBundle: TemplatePackage-watchOS.xcresult
+      artifactname: TemplatePackage-watchOS.xcresult
   packagevisionos:
     name: Build and Test Swift Package visionOS
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
       xcodeversion: latest
       scheme: TemplatePackage
-      resultBundle: TemplatePackageVisionOS.xcresult
       destination: 'platform=visionOS Simulator,name=Apple Vision Pro'
-      artifactname: TemplatePackageVisionOS.xcresult
+      resultBundle: TemplatePackage-visionOS.xcresult
+      artifactname: TemplatePackage-visionOS.xcresult
   packagetvos:
     name: Build and Test Swift Package tvOS
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
@@ -46,9 +47,9 @@ jobs:
       runsonlabels: '["macOS", "self-hosted"]'
       xcodeversion: latest
       scheme: TemplatePackage
-      resultBundle: TemplatePackageTvOS.xcresult
+      resultBundle: TemplatePackage-tvOS.xcresult
       destination: 'platform=tvOS Simulator,name=Apple TV 4K (3rd generation)'
-      artifactname: TemplatePackageTvOS.xcresult
+      artifactname: TemplatePackage-tvOS.xcresult
   packagemacos:
     name: Build and Test Swift Package macOS
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
@@ -56,52 +57,53 @@ jobs:
       runsonlabels: '["macOS", "self-hosted"]'
       xcodeversion: latest
       scheme: TemplatePackage
-      resultBundle: TemplatePackageMacOS.xcresult
+      resultBundle: TemplatePackage-macOS.xcresult
       destination: 'platform=macOS,arch=arm64'
-      artifactname: TemplatePackageMacOS.xcresult
+      artifactname: TemplatePackage-macOS.xcresult
   ios:
     name: Build and Test iOS
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
       path: 'Tests/UITests'
       scheme: TestApp
-      artifactname: TestApp.xcresult
+      resultBundle: TestApp-iOS.xcresult
+      artifactname: TestApp-iOS.xcresult
   ipados:
     name: Build and Test iPadOS
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
       path: 'Tests/UITests'
       scheme: TestApp
-      resultBundle: TestAppiPadOS.xcresult
       destination: 'platform=iOS Simulator,name=iPad Air (5th generation)'
-      artifactname: TestAppiPadOS.xcresult
+      resultBundle: TestApp-iPadOS.xcresult
+      artifactname: TestApp-iPadOS.xcresult
   watchos:
     name: Build and Test watchOS
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
       path: 'Tests/UITests'
       scheme: TestAppWatchApp
-      resultBundle: TestAppWatchApp.xcresult
       destination: 'platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)'
-      artifactname: TestAppWatchApp.xcresult
+      resultBundle: TestApp-watchOS.xcresult
+      artifactname: TestApp-watchOS.xcresult
   visionos:
     name: Build and Test visionOS
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
       path: 'Tests/UITests'
       scheme: TestApp
-      resultBundle: TestAppVisionOS.xcresult
       destination: 'platform=visionOS Simulator,name=Apple Vision Pro'
-      artifactname: TestAppVisionOS.xcresult
+      resultBundle: TestApp-visionOS.xcresult
+      artifactname: TestApp-visionOS.xcresult
   tvos:
     name: Build and Test tvOS
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
       path: 'Tests/UITests'
       scheme: TestApp
-      resultBundle: TestAppTVOS.xcresult
       destination: 'platform=tvOS Simulator,name=Apple TV 4K (3rd generation)'
-      artifactname: TestAppTVOS.xcresult
+      resultBundle: TestApp-tvOS.xcresult
+      artifactname: TestApp-tvOS.xcresult
   codeql:
     name: CodeQL
     uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
@@ -117,4 +119,4 @@ jobs:
     needs: [packageios, packagewatchos, packagevisionos, packagetvos, packagemacos, ios, ipados, watchos, visionos, tvos]
     uses: StanfordBDHG/.github/.github/workflows/create-and-upload-coverage-report.yml@v2
     with:
-      coveragereports: TemplatePackage.xcresult TemplatePackageWatchOS.xcresult TemplatePackageVisionOS.xcresult TemplatePackageTvOS.xcresult TemplatePackageMacOS.xcresult TestApp.xcresult TestAppiPadOS.xcresult TestAppWatchApp.xcresult TestAppVisionOS.xcresult TestAppTVOS.xcresult TestAppMacOS.xcresult
+      coveragereports: TemplatePackage-iOS.xcresult TemplatePackage-watchOS.xcresult TemplatePackage-visionOS.xcresult TemplatePackage-tvOS.xcresult TemplatePackage-macOS.xcresult TestApp-iOS.xcresult TestApp-iPadOS.xcresult TestApp-watchOS.xcresult TestApp-visionOS.xcresult TestApp-tvOS.xcresult TestAppMacOS.xcresult