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.

Sign up for GitHub

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

Jump to bottom

Sync repo in an SPM-friendly way #3827

Merged
merged 24 commits into from
Apr 19, 2024
Merged

Sync repo in an SPM-friendly way #3827

Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
426240f
Initial sync test
jamesrb1 Apr 19, 2024
1e7c238
no base job
jamesrb1 Apr 19, 2024
0551b7e
Specify machine to use
jamesrb1 Apr 19, 2024
7763170
Try generic docker
jamesrb1 Apr 19, 2024
94eacb3
Testing: Go back 3 commits and push
jamesrb1 Apr 19, 2024
de211b6
Revert "Testing: Go back 3 commits and push"
jamesrb1 Apr 19, 2024
a22ca6e
Skip trust github key
jamesrb1 Apr 19, 2024
b570cc4
Simplofy
jamesrb1 Apr 19, 2024
9c29261
Testing on alt repos
jamesrb1 Apr 19, 2024
447af08
Revert "Testing on alt repos"
jamesrb1 Apr 19, 2024
4b8c573
Version for PR
jamesrb1 Apr 19, 2024
e35dd84
Revert "Version for PR"
jamesrb1 Apr 19, 2024
9d7f5a2
small resource class
jamesrb1 Apr 19, 2024
e71a789
Add `push-to-spm` to `release-train`
jamesrb1 Apr 19, 2024
0483ebf
Move `push-to-spm` to commands
jamesrb1 Apr 19, 2024
2f4e6f2
Commands cannot have execution environments
jamesrb1 Apr 19, 2024
c343d1c
Add back workflow test
jamesrb1 Apr 19, 2024
739a127
Fix job name
jamesrb1 Apr 19, 2024
46346d9
Final for PR
jamesrb1 Apr 19, 2024
e5c5f89
Don’t need the job anymore
jamesrb1 Apr 19, 2024
f24b987
Test on protected branch
jamesrb1 Apr 19, 2024
abede36
Force push to bypass branch protection…?
jamesrb1 Apr 19, 2024
df3653e
Revert "Force push to bypass branch protection…?"
jamesrb1 Apr 19, 2024
3f14666
Revert "Test on protected branch"
jamesrb1 Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,20 @@ commands:
path: fastlane/test_output/xctest
destination: scan-test-output

push-to-spm:
steps:
- checkout
- setup-git-credentials
- run:
name: Clone purchases-ios and push to purchases-ios-spm
command: |
git clone https://github.com/RevenueCat/purchases-ios.git
cd purchases-ios
Comment on lines +349 to +350
Copy link
Member

Choose a reason for hiding this comment

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

this will always be running from a clone, right? why do we do this instead of adding the other repo as an alt remote to the existing repo?

Copy link
Member Author

Choose a reason for hiding this comment

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

As discussed, merging now because it's working and we are biased to shipping, will return to this as a possible future improvement.

git fetch --tags
git remote set-url origin https://github.com/RevenueCat/purchases-ios-spm.git
git push origin
git push --tags
Comment on lines +349 to +354
Copy link
Member

Choose a reason for hiding this comment

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

[not needed for this PR] ideally we'd move this to fastlane, we try to keep the CI stuff as simple as possible and move stuff into fastlane which is much easier to test.
Also it feels like the URLs might be a good thing to move into env variables in case we rename them, but not a dealbreaker and we might never need it in any case.


jobs:
spm-release-build-xcode-14:
<<: *base-job
Expand Down Expand Up @@ -1007,6 +1021,7 @@ jobs:
- run:
name: Create automatic PR
command: bundle exec fastlane automatic_bump github_rate_limit:10
- push-to-spm
Copy link
Contributor

Choose a reason for hiding this comment

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

is there a reason why this is done in the release-train workflow and not in the deploy workflow?

The release-train workflow opens an automatic PR increasing the version, and preparing for a new release. The deploy is the one that makes the release.

Is it intentional?


integration-tests-all:
<<: *base-job
Expand Down