From 1ba6bedf476cfd8faf30c9ac0dfb17ec9bc8da9c Mon Sep 17 00:00:00 2001 From: Bruno Mazzo Date: Mon, 23 Jun 2025 14:16:40 +1000 Subject: [PATCH 1/6] Change to use github hosted machines --- .github/workflows/ios.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index aa510cd..42cf284 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -8,7 +8,7 @@ on: jobs: parallel-testing: name: Cloned simulator - runs-on: self-hosted + runs-on: macos-latest steps: - name: Checkout uses: actions/checkout@v3 @@ -41,7 +41,7 @@ jobs: # path: Client/logfile.txt single-device-testing: name: Normal simulator - runs-on: self-hosted + runs-on: macos-latest steps: - name: Checkout uses: actions/checkout@v3 From f6bfb1e678492c823c23b9d8ef5b17163e238a3e Mon Sep 17 00:00:00 2001 From: Bruno Mazzo Date: Mon, 23 Jun 2025 14:24:49 +1000 Subject: [PATCH 2/6] set xcode before building --- .github/workflows/ios.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 42cf284..ef2c517 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -8,10 +8,13 @@ on: jobs: parallel-testing: name: Cloned simulator - runs-on: macos-latest + runs-on: macos-latest steps: - name: Checkout uses: actions/checkout@v3 + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: latest-stable - name: Build & Test run: | make test-parallel @@ -45,6 +48,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: latest-stable - name: Build & Test timeout-minutes: 20 run: | From 23e2ef3c4f1956eb6d9f8b5b88b653e0f787ae4c Mon Sep 17 00:00:00 2001 From: Bruno Mazzo Date: Mon, 23 Jun 2025 14:25:42 +1000 Subject: [PATCH 3/6] update github action version --- .github/workflows/ios.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index ef2c517..ceca9a0 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - uses: maxim-lobanov/setup-xcode@v1 + - uses: maxim-lobanov/setup-xcode@v1.6.0 with: xcode-version: latest-stable - name: Build & Test @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - uses: maxim-lobanov/setup-xcode@v1 + - uses: maxim-lobanov/setup-xcode@v1.6.0 with: xcode-version: latest-stable - name: Build & Test From f4d968fac041dd0a0e7a7bbd1d786a80a931e1e5 Mon Sep 17 00:00:00 2001 From: Bruno Mazzo Date: Mon, 23 Jun 2025 14:28:57 +1000 Subject: [PATCH 4/6] update test iOS host version --- makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index f77617a..0bd5d66 100644 --- a/makefile +++ b/makefile @@ -7,7 +7,7 @@ test: set -o pipefail && xcodebuild -project Client/Client.xcodeproj \ -scheme Client \ test \ - -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.0' \ + -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.2' \ -resultBundlePath test-result.xcresult \ -derivedDataPath 'derivedData' \ -clonedSourcePackagesDirPath SourcePackages \ @@ -35,7 +35,7 @@ generate-zip: (cd $(root)/Server/ && zip -r $(root)/Lib/Sources/UIUnitTestCLI/resources/Server.zip *) || exit 1 xcodebuild -project ./Server/Server.xcodeproj \ -scheme ServerUITests -sdk iphonesimulator \ - -destination "platform=iOS Simulator,name=iPhone 16,OS=18.0" \ + -destination "platform=iOS Simulator,name=iPhone 16,OS=18.2" \ -IDEBuildLocationStyle=Custom \ -IDECustomBuildLocationType=Absolute \ -IDECustomBuildProductsPath="$(root)/build/Products" \ From db3c89fdbe664384ffb622f4fa4790c5d958473b Mon Sep 17 00:00:00 2001 From: Bruno Mazzo Date: Mon, 23 Jun 2025 14:31:54 +1000 Subject: [PATCH 5/6] fix test ios version --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 0bd5d66..32b57ee 100644 --- a/makefile +++ b/makefile @@ -20,7 +20,7 @@ test-parallel: NSUnbufferedIO=YES xcodebuild -project Client/Client.xcodeproj \ -scheme "ClientTests - Parallel" \ test \ - -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.0' \ + -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.2' \ -resultBundlePath test-result.xcresult \ -clonedSourcePackagesDirPath SourcePackages \ -disableAutomaticPackageResolution \ From 4fb15c3aa17b24a9a86b346322c744f17c73b0a8 Mon Sep 17 00:00:00 2001 From: Bruno Mazzo Date: Mon, 23 Jun 2025 14:50:30 +1000 Subject: [PATCH 6/6] try to use a different build in the CI --- .github/workflows/ios.yml | 2 +- makefile | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index ceca9a0..afca9e3 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -55,7 +55,7 @@ jobs: timeout-minutes: 20 run: | #run UIUnitTest server - make test + make test.ci # - name: Archive cli logs # if: always() # uses: actions/upload-artifact@v3 diff --git a/makefile b/makefile index 32b57ee..6183a2d 100644 --- a/makefile +++ b/makefile @@ -13,6 +13,20 @@ test: -clonedSourcePackagesDirPath SourcePackages \ -disableAutomaticPackageResolution | xcbeautify --report junit +.PHONY: test.ci +test.ci: + $(MAKE) clean-up + $(MAKE) generate-zip + set -o pipefail && xcodebuild -project Client/Client.xcodeproj \ + -scheme Client \ + test \ + -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.2' \ + -resultBundlePath test-result.xcresult \ + -derivedDataPath 'derivedData' \ + -clonedSourcePackagesDirPath SourcePackages \ + -disableAutomaticPackageResolution | xcbeautify --report junit + + .PHONY: test-parallel test-parallel: $(MAKE) clean-up