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

Use fastlane for more ci stability #4750

Merged
merged 6 commits into from
Nov 17, 2023
Merged

Use fastlane for more ci stability #4750

merged 6 commits into from
Nov 17, 2023

Conversation

m-kuhn
Copy link
Member

@m-kuhn m-kuhn commented Nov 11, 2023

A standard tool rather than custom code that currently fails ...

@qfield-fairy
Copy link
Collaborator

qfield-fairy commented Nov 11, 2023

@m-kuhn m-kuhn enabled auto-merge (squash) November 11, 2023 19:29
@m-kuhn m-kuhn force-pushed the fastlane2 branch 2 times, most recently from 7fe20e8 to 313565b Compare November 16, 2023 18:32
@m-kuhn m-kuhn disabled auto-merge November 16, 2023 22:26
@m-kuhn m-kuhn force-pushed the fastlane2 branch 3 times, most recently from 38b13bf to 230870f Compare November 17, 2023 08:33
@m-kuhn m-kuhn changed the title Use fastlane to upload to s3 Use fastlane for more ci stability Nov 17, 2023
@m-kuhn m-kuhn force-pushed the fastlane2 branch 6 times, most recently from f0161c4 to 29028b9 Compare November 17, 2023 12:06
Copy link
Member

@nirvn nirvn left a comment

Choose a reason for hiding this comment

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

Fantastic work @m-kuhn

@m-kuhn m-kuhn force-pushed the fastlane2 branch 2 times, most recently from 1a09859 to e808746 Compare November 17, 2023 13:13
@m-kuhn m-kuhn merged commit 2a82dc7 into master Nov 17, 2023
19 checks passed
@m-kuhn m-kuhn deleted the fastlane2 branch November 17, 2023 16:02
@qfield-fairy
Copy link
Collaborator

The backport to release-3_0 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 404ea245e... Use fastlane to have more ios CI build stability
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging .github/workflows/ios.yml
CONFLICT (content): Merge conflict in .github/workflows/ios.yml

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-3_0 release-3_0
# Navigate to the new working tree
cd .worktrees/backport-release-3_0
# Create a new branch
git switch --create backport-4750-to-release-3_0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 404ea245e4ead83ab53176f7b27461c6cb873e1e,d9810c39a6b3fbb2d510953ed2a8041270242fea,bfa448baa957ae31aa00beed6eae17cd127097f2,6fa4057a80efb8a8fee160451fe1461196f5efee,d4ac18dca15a4769c29f6812d7a30f1de5cb5641,16d497eb4e6a18d18383aee7bbf20edde1efc36f
# Push it to GitHub
git push --set-upstream origin backport-4750-to-release-3_0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_0

Then, create a pull request where the base branch is release-3_0 and the compare/head branch is backport-4750-to-release-3_0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants