Skip to content

docs: GA contributing update with additional ci and repository secret preparation.#319

Merged
RoyalOughtness merged 11 commits intosecureblue:livefrom
jherzstein:docs/GA-contributing-workflow-update
Mar 15, 2026
Merged

docs: GA contributing update with additional ci and repository secret preparation.#319
RoyalOughtness merged 11 commits intosecureblue:livefrom
jherzstein:docs/GA-contributing-workflow-update

Conversation

@jherzstein
Copy link
Contributor

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.

@underscorejoser
Copy link

underscorejoser commented Mar 13, 2026

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 git push --force-with-lease

So my suggestion would be something I currently do and I think @HastD also do:

  1. Fork it.
  2. Create a specific branch for build testing (test-build)
git switch -c test-build upstream/live
  1. Make all the changes required to properly build on GitHub Actions, then commit, tag and push
git add .
git commit -m "DO NOT MERGE: test-build setup"
git tag -f test-build-setup
git push origin test-build
  1. Then go on and create an actual branch for PR based on live
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
  1. Switch back to test-build and cherry pick the commit from new-feature
git switch test-build
git cherry-pick <hash>
git push origin test-build
  1. Test from image with tag br-test-build-43 (or latest with defined as default branch)

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-build

TBF, 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 Justfile)

Before rebasing you also need to add the image to policy.json:
podman image trust set -t accept ghcr.io/yourname

Copy link

@underscorejoser underscorejoser left a comment

Choose a reason for hiding this comment

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

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

@jherzstein jherzstein force-pushed the docs/GA-contributing-workflow-update branch from 38cfaf3 to 6e3e38e Compare March 14, 2026 15:38
@jherzstein jherzstein marked this pull request as ready for review March 14, 2026 16:25
@jherzstein jherzstein force-pushed the docs/GA-contributing-workflow-update branch from e295f04 to 26d9f19 Compare March 14, 2026 18:01
EsseLowNitro
EsseLowNitro previously approved these changes Mar 14, 2026
RoyalOughtness
RoyalOughtness previously approved these changes Mar 14, 2026
@jherzstein jherzstein requested a review from EsseLowNitro March 14, 2026 20:43
@jherzstein jherzstein force-pushed the docs/GA-contributing-workflow-update branch from 2cfb16f to f63541c Compare March 14, 2026 23:50
@jherzstein jherzstein force-pushed the docs/GA-contributing-workflow-update branch 3 times, most recently from 202dd8e to 7b94465 Compare March 14, 2026 23:59
@jherzstein jherzstein force-pushed the docs/GA-contributing-workflow-update branch from 7b94465 to 433b755 Compare March 15, 2026 00:46
@RoyalOughtness RoyalOughtness merged commit 62a2223 into secureblue:live Mar 15, 2026
2 checks passed
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

Successfully merging this pull request may close these issues.

Make sure Contributing building GitHub Actions is up to date

4 participants