Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SDK-3831] CI job for iOS 17 #1802

Closed
wants to merge 11 commits into from
8 changes: 4 additions & 4 deletions .github/workflows/carthage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
check:
runs-on: macos-latest
runs-on: macos-13

env:
LC_CTYPE: en_US.UTF-8
Expand All @@ -19,9 +19,9 @@ jobs:
- name: Check out SDK repo
uses: actions/checkout@v2

- name: Select Specific Xcode Version (14.2)
- name: Select Specific Xcode Version (15.0.1)
run: |
sudo xcode-select -s /Applications/Xcode_14.2.app
sudo xcode-select -s /Applications/Xcode_15.0.1.app
echo "Selected Xcode version:"
xcodebuild -version

Expand All @@ -37,4 +37,4 @@ jobs:
echo 'Installing Carthage dependencies...'
carthage update --use-xcframeworks --platform iOS --no-use-binaries
echo 'Building AblyCarthage example...'
xcodebuild build -scheme "AblyCarthage" -destination "platform=iOS Simulator,name=iPhone 14" -configuration "Debug"
xcodebuild build -scheme "AblyCarthage" -destination "platform=iOS Simulator,name=iPhone 15" -configuration "Debug"
6 changes: 3 additions & 3 deletions .github/workflows/check-pod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ on:

jobs:
check:
runs-on: macos-latest
runs-on: macos-13
steps:
- uses: actions/checkout@v2

- name: Select Specific Xcode Version (14.2)
- name: Select Specific Xcode Version (15.0.1)
run: |
sudo xcode-select -s /Applications/Xcode_14.2.app
sudo xcode-select -s /Applications/Xcode_15.0.1.app
echo "Selected Xcode version:"
xcodebuild -version

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
build:
runs-on: macos-latest
runs-on: macos-13

permissions:
deployments: write
Expand All @@ -19,9 +19,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Select Specific Xcode Version (14.2)
- name: Select Specific Xcode Version (15.0.1)
run: |
sudo xcode-select -s /Applications/Xcode_14.2.app
sudo xcode-select -s /Applications/Xcode_15.0.1.app
echo "Selected Xcode version:"
xcodebuild -version

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Integration Test: iOS 16.2"
name: "Integration Test: iOS 17.0"

on:
pull_request:
Expand All @@ -12,7 +12,7 @@ on:

jobs:
check:
runs-on: macos-latest
runs-on: macos-13

env:
LC_CTYPE: en_US.UTF-8
Expand All @@ -23,9 +23,9 @@ jobs:
- name: Check out SDK repo
uses: actions/checkout@v2

- name: Select Specific Xcode Version (14.2)
- name: Select Specific Xcode Version (15.0.1)
run: |
sudo xcode-select -s /Applications/Xcode_14.2.app
sudo xcode-select -s /Applications/Xcode_15.0.1.app
echo "Selected Xcode version:"
xcodebuild -version

Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
make submodules
bundle install
make update_carthage_dependencies_ios
bundle exec fastlane test_iOS16_2
bundle exec fastlane test_iOS17_0

- name: Check Static Analyzer Output
id: analyzer-output
Expand All @@ -76,20 +76,20 @@ jobs:
if: ${{ failure() && steps.analyzer-output.outcome == 'failure' }}
uses: actions/upload-artifact@v2
with:
name: static-analyzer-reports-test_iOS16_2
name: static-analyzer-reports-test_iOS17_0
path: ./derived_data/**/report-*.html

- name: Run Examples Tests
working-directory: ./Examples/Tests
run: |
pod repo update
pod install
bundle exec fastlane scan -s Tests --output-directory "fastlane/test_output/examples/test_iOS16_2"
bundle exec fastlane scan -s Tests --output-directory "fastlane/test_output/examples/test_iOS17_0"

- name: Build APNS Example Project
working-directory: ./Examples/AblyPush
run: |
xcodebuild build -scheme "AblyPushExample" -destination "platform=iOS Simulator,name=iPhone 14" -configuration "Debug"
xcodebuild build -scheme "AblyPushExample" -destination "platform=iOS Simulator,name=iPhone 15" -configuration "Debug"

- name: Xcodebuild Logs Artifact
if: always()
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration-test-macOS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
check:
runs-on: macos-latest
runs-on: macos-13

env:
LC_CTYPE: en_US.UTF-8
Expand All @@ -23,9 +23,9 @@ jobs:
- name: Check out SDK repo
uses: actions/checkout@v2

- name: Select Specific Xcode Version (14.2)
- name: Select Specific Xcode Version (15.0.1)
run: |
sudo xcode-select -s /Applications/Xcode_14.2.app
sudo xcode-select -s /Applications/Xcode_15.0.1.app
echo "Selected Xcode version:"
xcodebuild -version

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Integration Test: tvOS 16.1"
name: "Integration Test: tvOS 17.0"

on:
pull_request:
Expand All @@ -12,7 +12,7 @@ on:

jobs:
check:
runs-on: macos-latest
runs-on: macos-13

env:
LC_CTYPE: en_US.UTF-8
Expand All @@ -23,9 +23,9 @@ jobs:
- name: Check out SDK repo
uses: actions/checkout@v2

- name: Select Specific Xcode Version (14.2)
- name: Select Specific Xcode Version (15.0.1)
run: |
sudo xcode-select -s /Applications/Xcode_14.2.app
sudo xcode-select -s /Applications/Xcode_15.0.1.app
echo "Selected Xcode version:"
xcodebuild -version

Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
make submodules
bundle install
make update_carthage_dependencies_tvos
bundle exec fastlane test_tvOS16_1
bundle exec fastlane test_tvOS17_0

- name: Check Static Analyzer Output
id: analyzer-output
Expand All @@ -76,15 +76,15 @@ jobs:
if: ${{ failure() && steps.analyzer-output.outcome == 'failure' }}
uses: actions/upload-artifact@v2
with:
name: static-analyzer-reports-test_tvOS16_1
name: static-analyzer-reports-test_tvOS17_0
path: ./derived_data/**/report-*.html

- name: Run Examples Tests
working-directory: ./Examples/Tests
run: |
pod repo update
pod install
bundle exec fastlane scan -s Tests --output-directory "fastlane/test_output/examples/test_tvOS_16_1"
bundle exec fastlane scan -s Tests --output-directory "fastlane/test_output/examples/test_tvOS_17_0"

- name: Xcodebuild Logs Artifact
if: always()
Expand Down
7 changes: 3 additions & 4 deletions Scripts/carthage-with-workaround-for-issue-3019.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ set -euo pipefail
xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
trap 'rm -f "$xcconfig"' INT TERM HUP EXIT

# For Xcode 13 make sure EXCLUDED_ARCHS is set to arm architectures otherwise
# the build will fail on lipo due to duplicate architectures.
echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1400 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig
echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_arm64__XCODE_1400 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig
# Make sure EXCLUDED_ARCHS is set to arm architectures otherwise the xcodebuild will fail on lipo due to duplicate architectures.
echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1500 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig
echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_arm64__XCODE_1500 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig
echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig

export XCODE_XCCONFIG_FILE="$xcconfig"
Expand Down
9 changes: 0 additions & 9 deletions Test/Tests/RestClientTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1911,15 +1911,6 @@ class RestClientTests: XCTestCase {
let mockHTTPExecutor = MockHTTPExecutor()
rest.internal.httpExecutor = mockHTTPExecutor

do {
try rest.request("get", path: "new feature", params: nil, body: nil, headers: nil) { _, _ in
fail("Completion closure should not be called")
}
} catch let error as NSError {
XCTAssertEqual(error.code, ARTCustomRequestError.invalidPath.rawValue)
expect(error.localizedDescription).to(contain("Path isn't valid"))
}

do {
try rest.request("get", path: "", params: nil, body: nil, headers: nil) { _, _ in
fail("Completion closure should not be called")
Expand Down
4 changes: 2 additions & 2 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ end
platform :ios do

LANE_CONFIGS = [
LaneConfig.new(:test_iOS16_2, "Ably-iOS", ["iPhone 14 (16.2)"]),
LaneConfig.new(:test_tvOS16_1, "Ably-tvOS", ["Apple TV 4K (2nd generation) (16.1)"]),
LaneConfig.new(:test_iOS17_0, "Ably-iOS", ["iPhone 15"]),
LaneConfig.new(:test_tvOS17_0, "Ably-tvOS", ["Apple TV 4K (3rd generation) (17.0)"]),
LaneConfig.new(:test_macOS, "Ably-macOS")
]

Expand Down