docs: GA contributing update with additional ci and repository secret preparation.#319
Conversation
|
Currently the user is recommended to create a new branch for a PR and then they have to do all this process, right? The problem that I have is if they use this branch for PR it would include the changes to properly build, but they also can't test with github actions without committing, so maybe they would've need to do a commit for the actual change + a commit for reverting the changes, maybe even needing to So my suggestion would be something I currently do and I think @HastD also do:
git switch -c test-build upstream/live
git add .
git commit -m "DO NOT MERGE: test-build setup"
git tag -f test-build-setup
git push origin test-build
git switch -c new-feature upstream/live
# ... do the changes ...
git add .
git commit -m "feat: ducks can now fly"
git push origin new-feature
git switch test-build
git cherry-pick <hash>
git push origin test-build
To reset and and update the branch I do the following: git switch test-build # make sure we're on test-build
git reset --hard upstream/live
git cherry-pick test-build-setup # this is where the tag comes in hand
# can cherry-pick more commits or just add more commits for testing purpose
git push --force-with-lease origin test-buildTBF, it's kinda a lot and I wished it was more friendly, you could probably also use rebase instead of resetting every time but that's the way I do, maybe a script could help to streamline (like Before rebasing you also need to add the image to policy.json: |
underscorejoser
left a comment
There was a problem hiding this comment.
There's a lot of ways to mess with git that gives the same results, i'm just not knowledgeable to know what's better and friendly, need to search more
38cfaf3 to
6e3e38e
Compare
e295f04 to
26d9f19
Compare
2cfb16f to
f63541c
Compare
202dd8e to
7b94465
Compare
Co-authored-by: Jordan Herzstein <63795875+jherzstein@users.noreply.github.com>
7b94465 to
433b755
Compare
Closes #305
The information on GA in contributing has out of date and missing information on workflow files, as well as missing information on kernel signing keys.
This first commit simply adds the information I believe is necessary to add without significant reworking of the original steps. I am open to changing this a bit if an easier development workflow is presented.