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

How should we pull in changes from upstream trustify? #13

Closed
jcrossley3 opened this issue Sep 12, 2024 · 5 comments
Closed

How should we pull in changes from upstream trustify? #13

jcrossley3 opened this issue Sep 12, 2024 · 5 comments

Comments

@jcrossley3
Copy link
Collaborator

Can we automate a regular pull?

@jcrossley3
Copy link
Collaborator Author

@desmax74 is this possible? How do you achieve this in v1?

@desmax74
Copy link

@jcrossley3 on every pr will start a build with the changes if you configure the branch on konflux. Every pr produce a new image and push on a public quay repo.

@jcrossley3
Copy link
Collaborator Author

jcrossley3 commented Sep 18, 2024

@desmax74 right, but konflux is monitoring this repo, which is a fork of our main development repo. We'd like for konflux to produce a new image when PR's are merged upstream in https://github.com/trustification/trustify. Essentially, we want this repo, https://github.com/trustification/rhtpa -- the one konflux knows about -- to "mirror" its upstream, which konflux knows nothing about.

I was thinking we could regularly pull upstream changes into this repo -- preferably automatically, but I'd settle for manual if it's a straightforward process -- hence triggering konflux.

Possible?

@desmax74
Copy link

@jcrossley3 We do manually on the stable branch, used for the appsre to align with the latest release https://github.com/trustification/trustification/tree/stable on the PR konflux build and shows on github the result of the build and then after the merge another build to push the image produced on quay, I'm available to shows the entire process

@jcrossley3
Copy link
Collaborator Author

After a lot of trial and error, I have this workflow regularly merging changes from upstream trustify into this repo.

Once development stabilizes, we can turn the auto-merge off and be more strategic about cherry-picking upstream changes.

The action requires a token with workflow permission in order to merge changes beneath .github/workflows/

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

No branches or pull requests

2 participants