From 2bff37bfd6ae20a84969f68a0698c4f617784674 Mon Sep 17 00:00:00 2001 From: George Date: Sun, 10 Nov 2024 11:43:00 -0800 Subject: [PATCH 1/3] Remove sdk argument --- .devcontainer/default/devcontainer.json | 2 +- .../workflows/Build and Test (Package).yml | 24 +++++++++---------- .../workflows/Build and Test (Xcode App).yml | 23 +++++++----------- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/.devcontainer/default/devcontainer.json b/.devcontainer/default/devcontainer.json index d82b4bd..fb5d683 100644 --- a/.devcontainer/default/devcontainer.json +++ b/.devcontainer/default/devcontainer.json @@ -11,7 +11,7 @@ "mounts": [ /// Keep build products on a volume for performance and to separate host and guest build artifacts - "source=${localWorkspaceFolderBasename}-build,target=${containerWorkspaceFolder}/.build,type=volume", + "source=${localWorkspaceFolderBasename}-build,target=${containerWorkspaceFolder}/.build,type=volume" ], "remoteEnv": { diff --git a/.github/workflows/Build and Test (Package).yml b/.github/workflows/Build and Test (Package).yml index 64304c4..fc08c1c 100644 --- a/.github/workflows/Build and Test (Package).yml +++ b/.github/workflows/Build and Test (Package).yml @@ -14,13 +14,13 @@ jobs: matrix: xcode-version: - "16" - swift-configuration: + build-configuration: - "debug" - "release" runs-on: macos-15 - name: Build and Test (macOS, ${{ matrix.swift-configuration }}) + name: Build and Test (macOS, ${{ matrix.build-configuration }}) steps: - name: Checkout @@ -31,15 +31,15 @@ jobs: - name: Build run: | - swift build --configuration ${{ matrix.swift-configuration }} + swift build --configuration ${{ matrix.build-configuration }} - name: Build Tests - if: matrix.swift-configuration == 'debug' + if: matrix.build-configuration == 'debug' run: | - swift build --build-tests --configuration ${{ matrix.swift-configuration }} + swift build --build-tests --configuration ${{ matrix.build-configuration }} - name: Test - if: matrix.swift-configuration == 'debug' + if: matrix.build-configuration == 'debug' run: | swift test --skip-build @@ -52,9 +52,9 @@ jobs: strategy: matrix: devcontainer-name: ["default"] - swift-configuration: ["debug", "release"] + build-configuration: ["debug", "release"] - name: Build and Test (devcontainer/${{ matrix.devcontainer-name }}, ${{ matrix.swift-configuration }}) + name: Build and Test (devcontainer/${{ matrix.devcontainer-name }}, ${{ matrix.build-configuration }}) runs-on: ubuntu-latest @@ -77,19 +77,19 @@ jobs: with: push: never runCmd: | - swift build --configuration ${{ matrix.swift-configuration }} + swift build --configuration ${{ matrix.build-configuration }} - name: Build Tests - if: matrix.swift-configuration == 'debug' + if: matrix.build-configuration == 'debug' uses: devcontainers/ci@v0.3 with: push: never runCmd: | - swift build --build-tests --configuration ${{ matrix.swift-configuration }} + swift build --build-tests --configuration ${{ matrix.build-configuration }} - name: Test uses: devcontainers/ci@v0.3 - if: matrix.swift-configuration == 'debug' + if: matrix.build-configuration == 'debug' with: push: never runCmd: | diff --git a/.github/workflows/Build and Test (Xcode App).yml b/.github/workflows/Build and Test (Xcode App).yml index d3f346f..7f0e0f1 100644 --- a/.github/workflows/Build and Test (Xcode App).yml +++ b/.github/workflows/Build and Test (Xcode App).yml @@ -18,17 +18,15 @@ jobs: xcode-configuration: - name: iOS Simulator destination: "platform=iOS Simulator,name=iPhone 16" - sdk: "iphonesimulator" - name: macOS destination: "platform=macOS" - sdk: "macosx" - swift-configuration: - - "debug" - - "release" + build-configuration: + - "Debug" + - "Release" runs-on: macos-15 - name: Build and Test (${{ matrix.xcode-configuration.name }}, ${{ matrix.swift-configuration }}) + name: Build and Test (${{ matrix.xcode-configuration.name }}, ${{ matrix.build-configuration }}) steps: - name: Checkout @@ -43,19 +41,17 @@ jobs: -workspace .xcode/SwiftProjectTemplate.xcworkspace \ -scheme SwiftProjectTemplateApp \ -derivedDataPath ".build/Xcode.noindex/DerivedData" \ - -configuration "${{ matrix.swift-configuration }}" \ - -sdk "${{ matrix.xcode-configuration.sdk }}" \ + -configuration "${{ matrix.build-configuration }}" \ -destination "${{ matrix.xcode-configuration.destination }}" - name: SwiftPM Tests - if: matrix.swift-configuration == 'debug' + if: matrix.build-configuration == 'Debug' run: | xcrun xcodebuild test \ -workspace .xcode/SwiftProjectTemplate.xcworkspace \ -scheme SwiftProjectTemplateAppPackage \ -derivedDataPath ".build/Xcode.noindex/DerivedData" \ - -configuration "${{ matrix.swift-configuration }}" \ - -sdk "${{ matrix.xcode-configuration.sdk }}" \ + -configuration "${{ matrix.build-configuration }}" \ -destination "${{ matrix.xcode-configuration.destination }}" - name: UI Tests @@ -64,14 +60,13 @@ jobs: -workspace .xcode/SwiftProjectTemplate.xcworkspace \ -scheme SwiftProjectTemplateAppUITests \ -derivedDataPath ".build/Xcode.noindex/DerivedData" \ - -configuration "${{ matrix.swift-configuration }}" \ - -sdk "${{ matrix.xcode-configuration.sdk }}" \ + -configuration "${{ matrix.build-configuration }}" \ -destination "${{ matrix.xcode-configuration.destination }}" - name: Upload Test Results uses: actions/upload-artifact@v4 with: - name: Test Results (${{ matrix.xcode-configuration.name }}, ${{ matrix.swift-configuration }}) + name: Test Results (${{ matrix.xcode-configuration.name }}, ${{ matrix.build-configuration }}) path: .build/Xcode.noindex/DerivedData/Logs/Test - name: Check that repository is clean From 6b28c5a5d3bc4263332e477af3aae507419da367 Mon Sep 17 00:00:00 2001 From: George Date: Sun, 10 Nov 2024 11:50:08 -0800 Subject: [PATCH 2/3] Tweak path --- .github/workflows/Build and Test (Xcode App).yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Build and Test (Xcode App).yml b/.github/workflows/Build and Test (Xcode App).yml index 7f0e0f1..516d89a 100644 --- a/.github/workflows/Build and Test (Xcode App).yml +++ b/.github/workflows/Build and Test (Xcode App).yml @@ -38,7 +38,7 @@ jobs: - name: Build run: | xcrun xcodebuild clean build \ - -workspace .xcode/SwiftProjectTemplate.xcworkspace \ + -workspace SwiftProjectTemplate.xcworkspace \ -scheme SwiftProjectTemplateApp \ -derivedDataPath ".build/Xcode.noindex/DerivedData" \ -configuration "${{ matrix.build-configuration }}" \ @@ -48,7 +48,7 @@ jobs: if: matrix.build-configuration == 'Debug' run: | xcrun xcodebuild test \ - -workspace .xcode/SwiftProjectTemplate.xcworkspace \ + -workspace SwiftProjectTemplate.xcworkspace \ -scheme SwiftProjectTemplateAppPackage \ -derivedDataPath ".build/Xcode.noindex/DerivedData" \ -configuration "${{ matrix.build-configuration }}" \ @@ -57,7 +57,7 @@ jobs: - name: UI Tests run: | xcrun xcodebuild test \ - -workspace .xcode/SwiftProjectTemplate.xcworkspace \ + -workspace SwiftProjectTemplate.xcworkspace \ -scheme SwiftProjectTemplateAppUITests \ -derivedDataPath ".build/Xcode.noindex/DerivedData" \ -configuration "${{ matrix.build-configuration }}" \ From 218172e6471f8cbeaf9cec08e5ab08c0f8eb800c Mon Sep 17 00:00:00 2001 From: George Date: Sun, 10 Nov 2024 12:01:41 -0800 Subject: [PATCH 3/3] Change test name --- .../SwiftProjectTemplateAppPackageTests.swift} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .xcode/SwiftProjectTemplateAppPackage/Tests/{SwiftProjectTemplatePackageTests/SwiftProjectTemplatePackageTests.swift => SwiftProjectTemplateAppPackageTests/SwiftProjectTemplateAppPackageTests.swift} (100%) diff --git a/.xcode/SwiftProjectTemplateAppPackage/Tests/SwiftProjectTemplatePackageTests/SwiftProjectTemplatePackageTests.swift b/.xcode/SwiftProjectTemplateAppPackage/Tests/SwiftProjectTemplateAppPackageTests/SwiftProjectTemplateAppPackageTests.swift similarity index 100% rename from .xcode/SwiftProjectTemplateAppPackage/Tests/SwiftProjectTemplatePackageTests/SwiftProjectTemplatePackageTests.swift rename to .xcode/SwiftProjectTemplateAppPackage/Tests/SwiftProjectTemplateAppPackageTests/SwiftProjectTemplateAppPackageTests.swift