From 7d36cfaa4b750ae508cc951b4f6919e38b1b295d Mon Sep 17 00:00:00 2001 From: AJ Lauer Barinov Date: Tue, 26 Nov 2024 16:18:57 -0800 Subject: [PATCH 1/9] ci: add buildkite --- .buildkite/pipeline.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .buildkite/pipeline.yml diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml new file mode 100644 index 0000000..517fbf6 --- /dev/null +++ b/.buildkite/pipeline.yml @@ -0,0 +1,10 @@ +agents: + queue: "macOS-Monterey-12-4" + +steps: + - command: "./scripts/run-unit-tests.sh MuxUploadSDK" + label: ":xcode_simulator: Unit Tests" + - wait + - command: "./scripts/version-check.sh" + label: ":clipboard: Version Check" + branches: "releases/*" From 1c41f7c0419e19fc04f6942b73dc01d629bc73a6 Mon Sep 17 00:00:00 2001 From: AJ Lauer Barinov Date: Tue, 26 Nov 2024 16:25:32 -0800 Subject: [PATCH 2/9] ci: remove GHA run tests --- .github/workflows/run-tests.yml | 16 ---------------- 1 file changed, 16 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 0b5a25d..0000000 --- a/.github/workflows/run-tests.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Run Tests - -on: - push: - -jobs: - unit-tests: - name: Run Unit Tests - runs-on: macos-14 - steps: - - name: Install xcbeautify - run: brew install xcbeautify - - name: Checkout - uses: actions/checkout@v3 - - name: Run Tests - run: "scripts/run-unit-tests.sh MuxUploadSDK" From f70ff7ffaee20c3ba51dd8b22e48587f4411f609 Mon Sep 17 00:00:00 2001 From: AJ Lauer Barinov Date: Tue, 26 Nov 2024 16:26:17 -0800 Subject: [PATCH 3/9] fix syntax error --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 517fbf6..8539434 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -2,7 +2,7 @@ agents: queue: "macOS-Monterey-12-4" steps: - - command: "./scripts/run-unit-tests.sh MuxUploadSDK" + - command: "./scripts/run-unit-tests.sh MuxUploadSDK" label: ":xcode_simulator: Unit Tests" - wait - command: "./scripts/version-check.sh" From a70aaeaed2dfd207b817f9e82330f6f2ba16b712 Mon Sep 17 00:00:00 2001 From: AJ Lauer Barinov Date: Tue, 26 Nov 2024 16:27:11 -0800 Subject: [PATCH 4/9] ci: remove GHA version check --- .github/workflows/validate-release.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .github/workflows/validate-release.yml diff --git a/.github/workflows/validate-release.yml b/.github/workflows/validate-release.yml deleted file mode 100644 index 95a91b7..0000000 --- a/.github/workflows/validate-release.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Validate release - -on: - push: - branches: - - 'releases/**' - -jobs: - versioncheck: - runs-on: macos-latest - name: Validate Versions - steps: - - name: Compare Podspec Version - uses: actions/checkout@v2 - - name: Run Version Check Script - run: ./scripts/version-check.sh - From b2e706da6e0e48c4396709c60b350db392c1936f Mon Sep 17 00:00:00 2001 From: AJ Lauer Barinov Date: Tue, 26 Nov 2024 16:28:03 -0800 Subject: [PATCH 5/9] ci: use default Xcode --- scripts/run-unit-tests.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/run-unit-tests.sh b/scripts/run-unit-tests.sh index e87c6b7..5244147 100755 --- a/scripts/run-unit-tests.sh +++ b/scripts/run-unit-tests.sh @@ -17,10 +17,6 @@ then exit 1 fi -echo "▸ Selecting Xcode 15.4" - -sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer - echo "▸ Using Xcode Version: ${XCODE}" echo "▸ Available Xcode SDKs" From 80fe971999f4b98d5730a430b483d4c8af9477d2 Mon Sep 17 00:00:00 2001 From: AJ Lauer Barinov Date: Tue, 26 Nov 2024 16:30:38 -0800 Subject: [PATCH 6/9] ci: use available iphonesimulator SDK to run unit tests --- scripts/run-unit-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-unit-tests.sh b/scripts/run-unit-tests.sh index 5244147..b98197f 100755 --- a/scripts/run-unit-tests.sh +++ b/scripts/run-unit-tests.sh @@ -36,5 +36,5 @@ echo "▸ Test ${SCHEME}" xcodebuild clean test \ -scheme $SCHEME \ -destination 'platform=iOS Simulator,OS=17.5,name=iPhone 15' \ - -sdk iphonesimulator17.5 \ + -sdk iphonesimulator18.0 \ | xcbeautify From 740018d98ec4d526e7ba591b714320cf7aeee6b6 Mon Sep 17 00:00:00 2001 From: AJ Lauer Barinov Date: Tue, 26 Nov 2024 16:50:17 -0800 Subject: [PATCH 7/9] no release branch checks in buildkite config --- .buildkite/pipeline.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 8539434..c66dc8d 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -7,4 +7,3 @@ steps: - wait - command: "./scripts/version-check.sh" label: ":clipboard: Version Check" - branches: "releases/*" From add3228c069b473ff00981113f389fe1ece637c7 Mon Sep 17 00:00:00 2001 From: AJ Lauer Barinov Date: Tue, 26 Nov 2024 17:42:00 -0800 Subject: [PATCH 8/9] ci: fix version check --- scripts/version-check.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/scripts/version-check.sh b/scripts/version-check.sh index b7beab7..828e2ff 100755 --- a/scripts/version-check.sh +++ b/scripts/version-check.sh @@ -7,10 +7,22 @@ cocoapod_spec_version=$(grep -Eo '\b[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z-]+)?(\+[0 echo "Detected Cocoapod Spec Version: ${cocoapod_spec_version}" -# Checks branch name for a v followed by a semantic version MAJOR.MINOR.PATCH string -release_version=$(git branch --show-current | sed -E 's/.*v([0-9]+\.[0-9]+\.[0-9]+).*/\1/') +SEMANTIC_VERSION_FILE=Sources/MuxUploadSDK/PublicAPI/SemanticVersion.swift -echo "Inferred Release Version: ${release_version}" +release_version=$(awk ' + /let major/ { gsub(/[^0-9]/, "", $0); major = $0 } + /let minor/ { gsub(/[^0-9]/, "", $0); minor = $0 } + /let patch/ { gsub(/[^0-9]/, "", $0); patch = $0 } + END { + if (major && minor && patch) { + print major "." minor "." patch + } else { + print "Error: Version information not found" + } + } +' <(grep -E 'let major|let minor|let patch' "$SEMANTIC_VERSION_FILE")) + +echo $release_version if [ "${cocoapod_spec_version}" == "${release_version}" ]; then echo "Versions match" From e8d9157db01b07e1b98100286112b427e75747b8 Mon Sep 17 00:00:00 2001 From: AJ Lauer Barinov Date: Tue, 26 Nov 2024 17:44:01 -0800 Subject: [PATCH 9/9] ci: nicer script logs --- scripts/version-check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/version-check.sh b/scripts/version-check.sh index 828e2ff..977900e 100755 --- a/scripts/version-check.sh +++ b/scripts/version-check.sh @@ -22,11 +22,11 @@ release_version=$(awk ' } ' <(grep -E 'let major|let minor|let patch' "$SEMANTIC_VERSION_FILE")) -echo $release_version +echo "Release version found in ${SEMANTIC_VERSION_FILE}: ${release_version}" if [ "${cocoapod_spec_version}" == "${release_version}" ]; then echo "Versions match" else - echo "Versions do not match, please update ${COCOAPOD_SPEC} to ${release_version}" + echo "Versions do not match, please fix up ${COCOAPOD_SPEC} or ${release_version} to be consistent" exit 1 fi