From d4729b8f4a9fac214db7579c1408028745113ec8 Mon Sep 17 00:00:00 2001 From: Adel Date: Thu, 24 Sep 2026 14:18:43 +0200 Subject: [PATCH 1/4] update version test --- FlagShip.podspec | 2 +- FlagShip/Flagship.xcodeproj/project.pbxproj | 4 ++-- FlagShip/Source/Core/Flagship.swift | 2 ++ FlagShip/Source/Tools/FlagShipVersion.swift | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/FlagShip.podspec b/FlagShip.podspec index df6864a7..15607a4e 100644 --- a/FlagShip.podspec +++ b/FlagShip.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "FlagShip" - s.version = "5.0.0" + s.version = "6.0.1" s.summary = "Flagship SDK" # This description is used to generate tags and improve search results. diff --git a/FlagShip/Flagship.xcodeproj/project.pbxproj b/FlagShip/Flagship.xcodeproj/project.pbxproj index 91dac9dd..ef943849 100644 --- a/FlagShip/Flagship.xcodeproj/project.pbxproj +++ b/FlagShip/Flagship.xcodeproj/project.pbxproj @@ -1908,7 +1908,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 5.0.0; + MARKETING_VERSION = 6.0.1; OTHER_LDFLAGS = ""; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = ABTasty.FlagShip; @@ -1942,7 +1942,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 5.0.0; + MARKETING_VERSION = 6.0.1; OTHER_LDFLAGS = ""; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = ABTasty.FlagShip; diff --git a/FlagShip/Source/Core/Flagship.swift b/FlagShip/Source/Core/Flagship.swift index 529950cb..7617813a 100644 --- a/FlagShip/Source/Core/Flagship.swift +++ b/FlagShip/Source/Core/Flagship.swift @@ -6,6 +6,8 @@ import Foundation +/// Comment to test release + public class Flagship: NSObject { let fsQueue = DispatchQueue(label: "flagship.queue", attributes: .concurrent) diff --git a/FlagShip/Source/Tools/FlagShipVersion.swift b/FlagShip/Source/Tools/FlagShipVersion.swift index 4e97b457..0f11522a 100644 --- a/FlagShip/Source/Tools/FlagShipVersion.swift +++ b/FlagShip/Source/Tools/FlagShipVersion.swift @@ -9,4 +9,4 @@ import Foundation /// This file is automatically updated 2.0.0 -public let FlagShipVersion = "5.0.0" +public let FlagShipVersion = "6.0.1" From eef2b0e2bfb41c05b64145309e65893d158051b1 Mon Sep 17 00:00:00 2001 From: Adel Date: Thu, 24 Sep 2026 15:42:19 +0200 Subject: [PATCH 2/4] update version to 5 0 1 --- FlagShip.podspec | 2 +- FlagShip/Flagship.xcodeproj/project.pbxproj | 4 ++-- FlagShip/Source/Core/Flagship.swift | 2 -- FlagShip/Source/Tools/FlagShipVersion.swift | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/FlagShip.podspec b/FlagShip.podspec index 15607a4e..331e9b35 100644 --- a/FlagShip.podspec +++ b/FlagShip.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "FlagShip" - s.version = "6.0.1" + s.version = "5.0.1" s.summary = "Flagship SDK" # This description is used to generate tags and improve search results. diff --git a/FlagShip/Flagship.xcodeproj/project.pbxproj b/FlagShip/Flagship.xcodeproj/project.pbxproj index ef943849..c3e78b1f 100644 --- a/FlagShip/Flagship.xcodeproj/project.pbxproj +++ b/FlagShip/Flagship.xcodeproj/project.pbxproj @@ -1908,7 +1908,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 6.0.1; + MARKETING_VERSION = 5.0.1; OTHER_LDFLAGS = ""; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = ABTasty.FlagShip; @@ -1942,7 +1942,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 6.0.1; + MARKETING_VERSION = 5.0.1; OTHER_LDFLAGS = ""; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = ABTasty.FlagShip; diff --git a/FlagShip/Source/Core/Flagship.swift b/FlagShip/Source/Core/Flagship.swift index 7617813a..529950cb 100644 --- a/FlagShip/Source/Core/Flagship.swift +++ b/FlagShip/Source/Core/Flagship.swift @@ -6,8 +6,6 @@ import Foundation -/// Comment to test release - public class Flagship: NSObject { let fsQueue = DispatchQueue(label: "flagship.queue", attributes: .concurrent) diff --git a/FlagShip/Source/Tools/FlagShipVersion.swift b/FlagShip/Source/Tools/FlagShipVersion.swift index 0f11522a..5a3d5766 100644 --- a/FlagShip/Source/Tools/FlagShipVersion.swift +++ b/FlagShip/Source/Tools/FlagShipVersion.swift @@ -9,4 +9,4 @@ import Foundation /// This file is automatically updated 2.0.0 -public let FlagShipVersion = "6.0.1" +public let FlagShipVersion = "5.0.1" From cc6ff67bcedf1f7619e6cce58e11576e4594a688 Mon Sep 17 00:00:00 2001 From: Adel Date: Thu, 24 Sep 2026 16:05:07 +0200 Subject: [PATCH 3/4] fix ci because device not found in the last runner --- .github/workflows/flagship_ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/flagship_ci.yml b/.github/workflows/flagship_ci.yml index f2ea81e6..d567fc35 100644 --- a/.github/workflows/flagship_ci.yml +++ b/.github/workflows/flagship_ci.yml @@ -6,11 +6,11 @@ on: - master jobs: Build_SDK: - runs-on: macos-latest + runs-on: macos-15 strategy: matrix: run-config: - - { scheme: 'Flagship', destination: 'platform=iOS Simulator,name=iPhone 17', label: 'iOS'} + - { scheme: 'Flagship', destination: 'platform=iOS Simulator,name=iPhone 16', label: 'iOS'} - { scheme: 'Flagship-tvOS', destination: 'platform=tvOS Simulator,name=Apple TV', label: 'tvOS' } - { scheme: 'Flagship-macOS', destination: 'platform=macOS', label: 'macOS'} - { scheme: 'Flagship-watchOS', destination: 'platform=watchOS Simulator,name=Apple Watch Ultra 3 (49mm),OS=26.2', label: 'watchOS'} @@ -22,12 +22,12 @@ jobs: run: xcodebuild clean build -project Flagship/Flagship.xcodeproj -scheme '${{ matrix.run-config['scheme'] }}' -destination '${{ matrix.run-config['destination'] }}' Testing: needs: Build_SDK - runs-on: macos-latest + runs-on: macos-15 steps: - name: Checkout Project uses: actions/checkout@v4 - name: Test SDK Flagship - run: xcodebuild test -project Flagship/Flagship.xcodeproj -scheme "Flagship" -destination "platform=iOS Simulator,name=iPhone 17" -enableCodeCoverage YES + run: xcodebuild test -project Flagship/Flagship.xcodeproj -scheme "Flagship" -destination "platform=iOS Simulator,name=iPhone 16" -enableCodeCoverage YES - name: Upload coverage to Codecov uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 with: From a91a36657cc194023e3fd7f70269473201d0787e Mon Sep 17 00:00:00 2001 From: Adel Date: Thu, 24 Sep 2026 16:20:36 +0200 Subject: [PATCH 4/4] improve ci actions --- .github/workflows/flagship_ci.yml | 33 ++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/.github/workflows/flagship_ci.yml b/.github/workflows/flagship_ci.yml index d567fc35..603aecd5 100644 --- a/.github/workflows/flagship_ci.yml +++ b/.github/workflows/flagship_ci.yml @@ -6,15 +6,16 @@ on: - master jobs: Build_SDK: - runs-on: macos-15 + runs-on: macos-latest strategy: matrix: run-config: - - { scheme: 'Flagship', destination: 'platform=iOS Simulator,name=iPhone 16', label: 'iOS'} - - { scheme: 'Flagship-tvOS', destination: 'platform=tvOS Simulator,name=Apple TV', label: 'tvOS' } + # Generic destinations don't depend on a specific simulator being installed on the runner + - { scheme: 'Flagship', destination: 'generic/platform=iOS Simulator', label: 'iOS'} + - { scheme: 'Flagship-tvOS', destination: 'generic/platform=tvOS Simulator', label: 'tvOS' } - { scheme: 'Flagship-macOS', destination: 'platform=macOS', label: 'macOS'} - - { scheme: 'Flagship-watchOS', destination: 'platform=watchOS Simulator,name=Apple Watch Ultra 3 (49mm),OS=26.2', label: 'watchOS'} - + - { scheme: 'Flagship-watchOS', destination: 'generic/platform=watchOS Simulator', label: 'watchOS'} + steps: - name: Checkout Project uses: actions/checkout@v4 @@ -22,12 +23,30 @@ jobs: run: xcodebuild clean build -project Flagship/Flagship.xcodeproj -scheme '${{ matrix.run-config['scheme'] }}' -destination '${{ matrix.run-config['destination'] }}' Testing: needs: Build_SDK - runs-on: macos-15 + runs-on: macos-latest steps: - name: Checkout Project uses: actions/checkout@v4 + - name: Pick an available iPhone simulator + id: sim + run: | + # Pick the first available iPhone on the newest installed iOS runtime + UDID=$(xcrun simctl list devices available -j | jq -r ' + .devices | to_entries + | map(select(.key | test("SimRuntime\\.iOS-"))) + | sort_by(.key | capture("iOS-(?[0-9-]+)").v | split("-") | map(tonumber)) + | reverse + | map(.value[] | select(.name | startswith("iPhone"))) + | .[0].udid // empty') + if [ -z "$UDID" ]; then + echo "No iPhone simulator available on this runner" + xcrun simctl list devices available + exit 1 + fi + echo "Using simulator: $(xcrun simctl list devices | grep "$UDID")" + echo "udid=$UDID" >> "$GITHUB_OUTPUT" - name: Test SDK Flagship - run: xcodebuild test -project Flagship/Flagship.xcodeproj -scheme "Flagship" -destination "platform=iOS Simulator,name=iPhone 16" -enableCodeCoverage YES + run: xcodebuild test -project Flagship/Flagship.xcodeproj -scheme "Flagship" -destination "platform=iOS Simulator,id=${{ steps.sim.outputs.udid }}" -enableCodeCoverage YES - name: Upload coverage to Codecov uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 with: