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

CircleCI: change all jobs to M1 #3140

Merged
merged 8 commits into from
Jan 18, 2024
Merged

CircleCI: change all jobs to M1 #3140

merged 8 commits into from
Jan 18, 2024

Conversation

NachoSoto
Copy link
Contributor

@NachoSoto NachoSoto commented Sep 5, 2023

CircleCI is deprecating Intel machines, so we need to get this working: https://discuss.circleci.com/t/macos-intel-support-deprecation-in-january-2024/48718

Deadline for this is January 31 2024. New deadline is 28 June 2024.

Note that Codecov isn't compatible (yet?) so I'm turning it off for now.

@NachoSoto NachoSoto added the ci Changes to our CI configuration files and scripts label Sep 5, 2023
@NachoSoto NachoSoto requested a review from a team September 5, 2023 16:07
Base automatically changed from debug-model-runtime-crash to main September 5, 2023 17:12
@NachoSoto
Copy link
Contributor Author

Updated deadline per CircleCI's update.

@NachoSoto NachoSoto force-pushed the nacho/testing-circleci-m1 branch 2 times, most recently from d0b6f5c to 413840d Compare January 12, 2024 00:24
@NachoSoto NachoSoto changed the base branch from main to integration-tests-ios-17-2 January 12, 2024 00:24
@NachoSoto NachoSoto changed the title [WIP] CircleCI: change all jobs to M1 CircleCI: change all jobs to M1 Jan 12, 2024
@NachoSoto NachoSoto marked this pull request as ready for review January 12, 2024 00:25
@NachoSoto
Copy link
Contributor Author

Need to verify release checks and installation tests

Base automatically changed from integration-tests-ios-17-2 to main January 12, 2024 01:14
.circleci/config.yml Outdated Show resolved Hide resolved
@NachoSoto
Copy link
Contributor Author

Glad I enabled everything, gotta fix release-checks / framework creation on M1, probably remove the Carthage workaround script.

Fixes https://app.circleci.com/pipelines/github/RevenueCat/purchases-ios/17208/workflows/729d01a6-d644-446c-8514-80b54177ff43/jobs/162052/tests
With #3140 and faster executors in CI, it's become clear that this test is very flaky because it relies on requests not finishing quickly enough.

For the first test, specifying a priority should ensure that tasks don't start running until they're all enqueued.
For the second test, it's important that if the first `CustomerInfo` request had finished, we don't make a second one, which would make the test fail.
@NachoSoto NachoSoto changed the base branch from main to integration-tests-flaky January 17, 2024 23:19
@NachoSoto NachoSoto changed the base branch from integration-tests-flaky to main January 18, 2024 00:03
@@ -31,42 +31,6 @@ class OtherIntegrationTests: BaseBackendIntegrationTests {
expect(info.isComputedOffline) == false
}

func testGetCustomerInfoMultipleTimesInParallel() async throws {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't figure out a way to write this test in a way that can't suffer from race conditions.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Luckily this is already covered by unit tests.

@NachoSoto NachoSoto enabled auto-merge (squash) January 18, 2024 00:14
@NachoSoto NachoSoto merged commit e82ee31 into main Jan 18, 2024
24 checks passed
@NachoSoto NachoSoto deleted the nacho/testing-circleci-m1 branch January 18, 2024 00:19
NachoSoto added a commit to RevenueCat/purchases-hybrid-common that referenced this pull request Jan 19, 2024
See also RevenueCat/purchases-ios#3140.

This also updates Xcode 15.0 to 15.2.
NachoSoto added a commit to RevenueCat/purchases-hybrid-common that referenced this pull request Jan 19, 2024
NachoSoto added a commit that referenced this pull request Jan 23, 2024
**This is an automatic release.**

### RevenueCatUI
* `PaywallViewController`: new initializer with `Offering` identifier
(#3587) via NachoSoto (@NachoSoto)
* `Paywalls`: improve template 5 layout for long product names (#3589)
via NachoSoto (@NachoSoto)
### Other Changes
* `Paywalls`: extracted `PaywallViewConfiguration` (#3586) via NachoSoto
(@NachoSoto)
* `CircleCI`: avoid installing `Xcodes` when not needed (#3585) via
NachoSoto (@NachoSoto)
* `CircleCI`: change all jobs to M1 (#3140) via NachoSoto (@NachoSoto)

---------

Co-authored-by: NachoSoto <ignaciosoto90@gmail.com>
Co-authored-by: NachoSoto <NachoSoto@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci Changes to our CI configuration files and scripts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants