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

Packaging: Cherry-pick changes to runners.sh from st2-packages #6302

Merged
merged 11 commits into from
Feb 22, 2025

Conversation

cognifloyd
Copy link
Member

@cognifloyd cognifloyd commented Feb 14, 2025

This is the first PR working towards doing packaging via pantsbuild. Eventually, I hope to archive and stop using st2-packages.git.

When st2-packages was split from the st2 repo, copies of some files ended up in both repos. In particular, the copies of st2actions/bin/runners.sh diverged, with more changes made in st2-packages following the split, and then confusion followed when we didn't know what to update.

I sifted through the git history to figure out the timeline of all the changes. Ultimately, I temporarily reverted the changes in st2.git, cherry-picked the changes from st2-packages.git, and then reapplied the st2.git specific changes. I tried to preserve the git history and git authorship. I also updated the cherry-picked commit messages to include a link to the original commit.

@cognifloyd cognifloyd added this to the pants milestone Feb 14, 2025
@cognifloyd cognifloyd requested a review from a team February 14, 2025 17:31
@cognifloyd cognifloyd self-assigned this Feb 14, 2025
@pull-request-size pull-request-size bot added the size/M PR that changes 30-99 lines. Good size to review. label Feb 14, 2025
@CLAassistant
Copy link

CLAassistant commented Feb 14, 2025

CLA assistant check
All committers have signed the CLA.

@cognifloyd

This comment was marked as outdated.

@cognifloyd cognifloyd changed the title Packaging: Cherry pick changes to runners.sh from st2-packages Packaging: Cherry-pick changes to runners.sh from st2-packages Feb 16, 2025
@cognifloyd
Copy link
Member Author

I just force pushed to update the cherry-picked commit messages to include a link to the original commit in st2-packages.

@StackStorm StackStorm deleted a comment from CLAassistant Feb 17, 2025
@cognifloyd
Copy link
Member Author

I force pushed again to sign the commits.

@cognifloyd cognifloyd enabled auto-merge February 20, 2025 16:28
@cognifloyd cognifloyd requested a review from winem February 22, 2025 02:30
@cognifloyd cognifloyd merged commit 49f61fc into master Feb 22, 2025
80 checks passed
@cognifloyd cognifloyd deleted the packaging-runners.sh branch February 22, 2025 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants