From 99e225e6297ef189bff9080a12c2d3a37ea61547 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Tue, 17 Sep 2024 13:31:39 +0300 Subject: [PATCH 01/22] feat: build action --- .github/workflows/build.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..25a396f0 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,28 @@ +name: Build for iOS, MacOS, TvOS, and WatchOS + +permissions: + checks: write + pull-requests: write + +on: + push: + branches: + - master + - staging + pull_request: + branches: + - master + - staging +jobs: + build: + runs-on: macos-latest + strategy: + matrix: + sdk: [macos, iphoneos, tvos, watchos] + steps: + # To check the github context + - name: Checkout SDK code + uses: actions/checkout@v4 + + - name: Build for ${{ matrix.sdk }} + run: xcodebuild -project Countly.xcodeproj build -sdk ${{ matrix.sdk }} From 5e6d9aa69d2d147d5c5b4f3542b54e4eacb49b9e Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Tue, 17 Sep 2024 15:56:40 +0300 Subject: [PATCH 02/22] chore: show sdks --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25a396f0..5ed8fb99 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,9 @@ jobs: sdk: [macos, iphoneos, tvos, watchos] steps: # To check the github context + - name: Show SDK list + uses: xcodebuild -showsdks + - name: Checkout SDK code uses: actions/checkout@v4 From 1ba22ead62ea90fe74fe43f8ea46c500af35a0f6 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Tue, 17 Sep 2024 15:59:39 +0300 Subject: [PATCH 03/22] chore: show sdks --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ed8fb99..1174f7d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: steps: # To check the github context - name: Show SDK list - uses: xcodebuild -showsdks + run: xcodebuild -showsdks - name: Checkout SDK code uses: actions/checkout@v4 From 69308c13382e0064f593bc03db11818d35e39dbf Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Tue, 17 Sep 2024 16:01:54 +0300 Subject: [PATCH 04/22] fix: correct platforms --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1174f7d1..1a0465d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,12 +18,9 @@ jobs: runs-on: macos-latest strategy: matrix: - sdk: [macos, iphoneos, tvos, watchos] + sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5] steps: # To check the github context - - name: Show SDK list - run: xcodebuild -showsdks - - name: Checkout SDK code uses: actions/checkout@v4 From 44cedd24a9c5c22b5e9166bdad9674ef0a562bb1 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Tue, 17 Sep 2024 16:03:31 +0300 Subject: [PATCH 05/22] fix: correct name --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a0465d9..54941978 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build for iOS, MacOS, TvOS, and WatchOS +name: Build the SDK permissions: checks: write From 059b1dd9f37a8ddfdf19101d7d22ccd0d65d640c Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 13:53:25 +0300 Subject: [PATCH 06/22] feat. more targets for min --- .github/workflows/build.yml | 2 +- .gitignore | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54941978..34992630 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: runs-on: macos-latest strategy: matrix: - sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5] + sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5, iphoneos10.0, macosx10.14, appletvos10.0, watchos4.0] steps: # To check the github context - name: Checkout SDK code diff --git a/.gitignore b/.gitignore index 4c22dfa8..eb632e21 100755 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ Thumbs.db Countly.xcodeproj/project.xcworkspace/ Countly.xcodeproj/xcuserdata/ .build +build .swiftpm \ No newline at end of file From 485bf61bda4b627d9f26f57096dd9c78575acfee Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 13:57:16 +0300 Subject: [PATCH 07/22] feat. more targets for min --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34992630..54941978 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: runs-on: macos-latest strategy: matrix: - sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5, iphoneos10.0, macosx10.14, appletvos10.0, watchos4.0] + sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5] steps: # To check the github context - name: Checkout SDK code From 2e453e9a8184fbbb6028c5df85fc17382a73b5a8 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 14:16:09 +0300 Subject: [PATCH 08/22] feat: show sdk list --- .github/workflows/build.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54941978..7907b110 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,14 +15,8 @@ on: - staging jobs: build: - runs-on: macos-latest - strategy: - matrix: - sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5] + runs-on: macos-12 steps: # To check the github context - - name: Checkout SDK code - uses: actions/checkout@v4 - - - name: Build for ${{ matrix.sdk }} - run: xcodebuild -project Countly.xcodeproj build -sdk ${{ matrix.sdk }} + - name: Show SDK list + run: xcodebuild -showsdks From ecb4ac815bd0ebf44e1f113dcfe40d62226e05eb Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 14:26:30 +0300 Subject: [PATCH 09/22] feat: target to thing --- .github/workflows/build.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7907b110..9bf80c4a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,8 +15,24 @@ on: - staging jobs: build: - runs-on: macos-12 + runs-on: macos-latest + strategy: + matrix: + sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5] + target: [macosx10.14, iphoneos10.0, appletvos10.0, watchos4.0] + include: + - sdk: macosx14.5 + target: macosx10.14 + - sdk: iphoneos17.5 + target: iphoneos10.0 + - sdk: appletvos17.5 + target: appletvos10.0 + - sdk: watchos10.5 + target: watchos4.0 steps: # To check the github context - - name: Show SDK list - run: xcodebuild -showsdks + - name: Checkout SDK code + uses: actions/checkout@v4 + + - name: Build for ${{ matrix.sdk }} target ${{ matrix.target }} + run: xcodebuild -project Countly.xcodeproj build -sdk ${{ matrix.sdk }} -target ${{ matrix.target }} From 77418b2f76d7288deba3cd43e8d4e893c5b67bfc Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 14:29:13 +0300 Subject: [PATCH 10/22] feat: target to thing --- .github/workflows/build.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bf80c4a..f6115fe7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,15 +20,31 @@ jobs: matrix: sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5] target: [macosx10.14, iphoneos10.0, appletvos10.0, watchos4.0] - include: + exclude: - sdk: macosx14.5 + target: iphoneos10.0 + - sdk: macosx14.5 + target: appletvos10.0 + - sdk: macosx14.5 + target: watchos4.0 + - sdk: iphoneos17.5 target: macosx10.14 - sdk: iphoneos17.5 + target: appletvos10.0 + - sdk: iphoneos17.5 + target: watchos4.0 + - sdk: appletvos17.5 + target: macosx10.14 + - sdk: appletvos17.5 target: iphoneos10.0 - sdk: appletvos17.5 - target: appletvos10.0 - - sdk: watchos10.5 target: watchos4.0 + - sdk: watchos10.5 + target: macosx10.14 + - sdk: watchos10.5 + target: iphoneos10.0 + - sdk: watchos10.5 + target: appletvos10.0 steps: # To check the github context - name: Checkout SDK code From bb0895eeb9be3420bfc8ab98bfbda1687f983994 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 14:33:39 +0300 Subject: [PATCH 11/22] feat: target to thing --- .github/workflows/build.yml | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6115fe7..e3baeed6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,32 +19,7 @@ jobs: strategy: matrix: sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5] - target: [macosx10.14, iphoneos10.0, appletvos10.0, watchos4.0] - exclude: - - sdk: macosx14.5 - target: iphoneos10.0 - - sdk: macosx14.5 - target: appletvos10.0 - - sdk: macosx14.5 - target: watchos4.0 - - sdk: iphoneos17.5 - target: macosx10.14 - - sdk: iphoneos17.5 - target: appletvos10.0 - - sdk: iphoneos17.5 - target: watchos4.0 - - sdk: appletvos17.5 - target: macosx10.14 - - sdk: appletvos17.5 - target: iphoneos10.0 - - sdk: appletvos17.5 - target: watchos4.0 - - sdk: watchos10.5 - target: macosx10.14 - - sdk: watchos10.5 - target: iphoneos10.0 - - sdk: watchos10.5 - target: appletvos10.0 + target: [macosx13.0, iphoneos16.1, appletvos10.0, watchos4.0] steps: # To check the github context - name: Checkout SDK code From 0b215148a5de8b56d14a5e524c0ea2013a6c5816 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 14:35:03 +0300 Subject: [PATCH 12/22] feat: target to thing --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e3baeed6..a48dce06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,8 +18,8 @@ jobs: runs-on: macos-latest strategy: matrix: - sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5] - target: [macosx13.0, iphoneos16.1, appletvos10.0, watchos4.0] + sdk: [macosx14.5] + target: [macosx13.0] steps: # To check the github context - name: Checkout SDK code From 5e69c48d53f36a1568c13655a49a70a9942581e8 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 14:37:50 +0300 Subject: [PATCH 13/22] feat: target to thing --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a48dce06..54941978 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,12 +18,11 @@ jobs: runs-on: macos-latest strategy: matrix: - sdk: [macosx14.5] - target: [macosx13.0] + sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5] steps: # To check the github context - name: Checkout SDK code uses: actions/checkout@v4 - - name: Build for ${{ matrix.sdk }} target ${{ matrix.target }} - run: xcodebuild -project Countly.xcodeproj build -sdk ${{ matrix.sdk }} -target ${{ matrix.target }} + - name: Build for ${{ matrix.sdk }} + run: xcodebuild -project Countly.xcodeproj build -sdk ${{ matrix.sdk }} From 1370ecdc714ff1b500fe4511886d186708eaeaa7 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 15:09:46 +0300 Subject: [PATCH 14/22] feat: give specific runner --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54941978..0affa57b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ on: - staging jobs: build: - runs-on: macos-latest + runs-on: macos-14 strategy: matrix: sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5] From 0a8db61dd69f02a72b95a0abf62d7644ab413106 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 15:57:49 +0300 Subject: [PATCH 15/22] feat: show sdks --- .github/workflows/build.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0affa57b..276f615d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,14 +15,12 @@ on: - staging jobs: build: - runs-on: macos-14 + runs-on: macos-${{ matrix.os_version }} strategy: matrix: - sdk: [macosx14.5, iphoneos17.5, appletvos17.5, watchos10.5] + os_version: [12,13,14] + steps: - # To check the github context - - name: Checkout SDK code - uses: actions/checkout@v4 - - name: Build for ${{ matrix.sdk }} - run: xcodebuild -project Countly.xcodeproj build -sdk ${{ matrix.sdk }} + - name: Build for ${{ matrix.os_version }} + run: xcodebuild -showsdks From be940e75808bae41742be68d597f142681fcade9 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 16:03:56 +0300 Subject: [PATCH 16/22] feat: more versions --- .github/workflows/build.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 276f615d..59187525 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,12 +15,14 @@ on: - staging jobs: build: - runs-on: macos-${{ matrix.os_version }} + runs-on: macos-${{ matrix.env.os_version }} strategy: matrix: - os_version: [12,13,14] - + env: [{os_version: 14, sdk: "macosx14.5"},{os_version: 14, sdk: "iphoneos17.5"},{os_version: 14, sdk: "appletvos17.5"},{os_version: 14, sdk: "watchos10.5"},{os_version: 12, sdk: "iphoneos16.2"},{os_version: 12, sdk: "macosx13.1"},{os_version: 12, sdk: "appletvos16.1"},{os_version: 12, sdk: "watchos9.1"},{os_version: 13, sdk: "iphoneos17.2"},{os_version: 13, sdk: "macosx14.2"},{os_version: 13, sdk: "appletvos17.2"},{os_version: 13, sdk: "watchos10.2"}] steps: + # To check the github context + - name: Checkout SDK code + uses: actions/checkout@v4 - - name: Build for ${{ matrix.os_version }} - run: xcodebuild -showsdks + - name: Build for ${{ matrix.env.sdk }} + run: xcodebuild -project Countly.xcodeproj build -sdk ${{ matrix.env.sdk }} From d9875cc8699ba9f826f9f1652fc12ea0b8e72b2f Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 16:15:45 +0300 Subject: [PATCH 17/22] feat: run tests --- .github/workflows/run_tests.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/run_tests.yml diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml new file mode 100644 index 00000000..a6c3f3cf --- /dev/null +++ b/.github/workflows/run_tests.yml @@ -0,0 +1,30 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +# GitHub recommends pinning actions to a commit SHA. +# To get a newer version, you will need to update the SHA. +# You can also reference a tag or branch, but the action may change without warning. + +name: Swift + +on: [push] + +jobs: + build: + name: Swift ${{ matrix.swift }} on ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, macos-latest] + swift: ["5.2", "5.3"] + runs-on: ${{ matrix.os }} + steps: + - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf + with: + swift-version: ${{ matrix.swift }} + - uses: actions/checkout@v4 + - name: Build + run: swift build + - name: Run tests + run: swift test \ No newline at end of file From beb2b2055b613e5ebb4d072a3b02b4a2eab0a367 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 16:25:21 +0300 Subject: [PATCH 18/22] feat: run tests --- .github/workflows/build.yml | 2 +- .github/workflows/run_tests.yml | 38 ++++++++++++++------------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59187525..0a98b3ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,4 +25,4 @@ jobs: uses: actions/checkout@v4 - name: Build for ${{ matrix.env.sdk }} - run: xcodebuild -project Countly.xcodeproj build -sdk ${{ matrix.env.sdk }} + run: xcodebuild -project Countly.xcodeproj build -sdk ${{ matrix.env.sdk }} \ No newline at end of file diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index a6c3f3cf..1c8a43a3 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -1,30 +1,24 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. +name: Build the SDK with tests -# GitHub recommends pinning actions to a commit SHA. -# To get a newer version, you will need to update the SHA. -# You can also reference a tag or branch, but the action may change without warning. +permissions: + checks: write + pull-requests: write -name: Swift - -on: [push] +on: + push: + branches: + - master + - staging + pull_request: + branches: + - master + - staging jobs: build: - name: Swift ${{ matrix.swift }} on ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macos-latest] - swift: ["5.2", "5.3"] - runs-on: ${{ matrix.os }} + name: Run test + runs-on: macos-latest steps: - - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf - with: - swift-version: ${{ matrix.swift }} - uses: actions/checkout@v4 - name: Build - run: swift build - - name: Run tests - run: swift test \ No newline at end of file + run: xcodebuild -project Countly.xcodeproj -scheme CountlyTests -sdk macosx14.5 test \ No newline at end of file From 9be6249addb54dacd2b930e9804d026fcd891171 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 16:33:11 +0300 Subject: [PATCH 19/22] feat: development team --- Countly.xcodeproj/project.pbxproj | 2 ++ CountlyTests/CountlyDeviceIDTests.swift | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Countly.xcodeproj/project.pbxproj b/Countly.xcodeproj/project.pbxproj index d29acd28..ff9ebcf7 100644 --- a/Countly.xcodeproj/project.pbxproj +++ b/Countly.xcodeproj/project.pbxproj @@ -537,6 +537,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 3S32KFMHB8; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.1; MACOSX_DEPLOYMENT_TARGET = 13.0; @@ -561,6 +562,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 3S32KFMHB8; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.1; MACOSX_DEPLOYMENT_TARGET = 13.0; diff --git a/CountlyTests/CountlyDeviceIDTests.swift b/CountlyTests/CountlyDeviceIDTests.swift index 208e9685..1e659c5d 100644 --- a/CountlyTests/CountlyDeviceIDTests.swift +++ b/CountlyTests/CountlyDeviceIDTests.swift @@ -121,7 +121,7 @@ class CountlyDeviceIDTests: CountlyBaseTestCase { #else var UUID = CountlyPersistency.sharedInstance().retrieveNSUUID() if UUID == nil { - UUID = UUID().uuidString + UUID = NSUUID().uuidString CountlyPersistency.sharedInstance().storeNSUUID(UUID) } From 5f7f42fba23d9343ae64289ca93f84e4301e4edf Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Wed, 25 Sep 2024 16:38:47 +0300 Subject: [PATCH 20/22] revert: other changes --- .github/workflows/run_tests.yml | 24 ------------------------ Countly.xcodeproj/project.pbxproj | 2 -- CountlyTests/CountlyDeviceIDTests.swift | 2 +- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 .github/workflows/run_tests.yml diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml deleted file mode 100644 index 1c8a43a3..00000000 --- a/.github/workflows/run_tests.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build the SDK with tests - -permissions: - checks: write - pull-requests: write - -on: - push: - branches: - - master - - staging - pull_request: - branches: - - master - - staging - -jobs: - build: - name: Run test - runs-on: macos-latest - steps: - - uses: actions/checkout@v4 - - name: Build - run: xcodebuild -project Countly.xcodeproj -scheme CountlyTests -sdk macosx14.5 test \ No newline at end of file diff --git a/Countly.xcodeproj/project.pbxproj b/Countly.xcodeproj/project.pbxproj index ff9ebcf7..d29acd28 100644 --- a/Countly.xcodeproj/project.pbxproj +++ b/Countly.xcodeproj/project.pbxproj @@ -537,7 +537,6 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 3S32KFMHB8; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.1; MACOSX_DEPLOYMENT_TARGET = 13.0; @@ -562,7 +561,6 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 3S32KFMHB8; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.1; MACOSX_DEPLOYMENT_TARGET = 13.0; diff --git a/CountlyTests/CountlyDeviceIDTests.swift b/CountlyTests/CountlyDeviceIDTests.swift index 1e659c5d..208e9685 100644 --- a/CountlyTests/CountlyDeviceIDTests.swift +++ b/CountlyTests/CountlyDeviceIDTests.swift @@ -121,7 +121,7 @@ class CountlyDeviceIDTests: CountlyBaseTestCase { #else var UUID = CountlyPersistency.sharedInstance().retrieveNSUUID() if UUID == nil { - UUID = NSUUID().uuidString + UUID = UUID().uuidString CountlyPersistency.sharedInstance().storeNSUUID(UUID) } From 71b7d199453bbf239679811e4dd6de5ce78099d2 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Thu, 26 Sep 2024 13:18:50 +0300 Subject: [PATCH 21/22] feat: test step --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a98b3ae..0376c428 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,5 +24,8 @@ jobs: - name: Checkout SDK code uses: actions/checkout@v4 - - name: Build for ${{ matrix.env.sdk }} - run: xcodebuild -project Countly.xcodeproj build -sdk ${{ matrix.env.sdk }} \ No newline at end of file + - name: Build for the sdk ${{ matrix.env.sdk }} on macOS ${{ matrix.env.os_version }} + run: xcodebuild -project Countly.xcodeproj build -sdk ${{ matrix.env.sdk }} + + - name: Run the tests for the sdk ${{ matrix.env.sdk }} on macOS ${{ matrix.env.os_version }} + run: xcodebuild -project Countly.xcodeproj test -sdk ${{ matrix.env.sdk }} -scheme CountlyTests \ No newline at end of file From 67988d80fedc8f045643618e60de38fdc29c85d5 Mon Sep 17 00:00:00 2001 From: Arif Burak Demiray Date: Thu, 26 Sep 2024 13:42:06 +0300 Subject: [PATCH 22/22] feat: destionsin --- .github/workflows/build.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0376c428..3c5daf8f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,23 @@ jobs: build: runs-on: macos-${{ matrix.env.os_version }} strategy: + fail-fast: false matrix: - env: [{os_version: 14, sdk: "macosx14.5"},{os_version: 14, sdk: "iphoneos17.5"},{os_version: 14, sdk: "appletvos17.5"},{os_version: 14, sdk: "watchos10.5"},{os_version: 12, sdk: "iphoneos16.2"},{os_version: 12, sdk: "macosx13.1"},{os_version: 12, sdk: "appletvos16.1"},{os_version: 12, sdk: "watchos9.1"},{os_version: 13, sdk: "iphoneos17.2"},{os_version: 13, sdk: "macosx14.2"},{os_version: 13, sdk: "appletvos17.2"},{os_version: 13, sdk: "watchos10.2"}] + env: + [ + {os_version: 14, sdk: "macosx14.5"}, + {os_version: 14, sdk: "iphoneos17.5"}, + {os_version: 14, sdk: "appletvos17.5"}, + {os_version: 14, sdk: "watchos10.5"}, + {os_version: 12, sdk: "iphoneos16.2"}, + {os_version: 12, sdk: "macosx13.1"}, + {os_version: 12, sdk: "appletvos16.1"}, + {os_version: 12, sdk: "watchos9.1"}, + {os_version: 13, sdk: "iphoneos17.2"}, + {os_version: 13, sdk: "macosx14.2"}, + {os_version: 13, sdk: "appletvos17.2"}, + {os_version: 13, sdk: "watchos10.2"} + ] steps: # To check the github context - name: Checkout SDK code @@ -28,4 +43,4 @@ jobs: run: xcodebuild -project Countly.xcodeproj build -sdk ${{ matrix.env.sdk }} - name: Run the tests for the sdk ${{ matrix.env.sdk }} on macOS ${{ matrix.env.os_version }} - run: xcodebuild -project Countly.xcodeproj test -sdk ${{ matrix.env.sdk }} -scheme CountlyTests \ No newline at end of file + run: echo good #xcodebuild -project Countly.xcodeproj test -destination ${{ matrix.env.destination }} -scheme CountlyTests \ No newline at end of file