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

Simplify CI image build workflow before v1.15 branch #29834

Merged
merged 2 commits into from
Dec 13, 2023

Conversation

joestringer
Copy link
Member

These files end up with massive diffs when trying to create a stable branch
from the main branch. With some minor care and attention, we can simplify the
steps to create a branch with identical workflows to the main branch.

See commits for more details:

  • .github: Remove branch names from step ids
  • .github: Only create Go cache for main branch push

joestringer and others added 2 commits December 12, 2023 15:03
This simplifies the branching steps for stable branches when we create
them.

Co-authored-by: Michi Mutsuzaki <michi@isovalent.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
This commit extends the conditional logic for running this logic against
the main branch, so that we can keep the steps in place on older
branches without causing the cache to get thrashed by stable branch
versions of the cache. This allows us to have fewer lines of diff
between the main and older (eg v1.14) branches.

Co-authored-by: Michi Mutsuzaki <michi@isovalent.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer requested review from a team as code owners December 12, 2023 23:05
@joestringer joestringer added the release-note/ci This PR makes changes to the CI. label Dec 12, 2023
@joestringer
Copy link
Member Author

CI passed with pull_request: https://github.com/cilium/cilium/actions/runs/7188393385?pr=29834

Dropping the test commit.

Copy link
Contributor

@michi-covalent michi-covalent left a comment

Choose a reason for hiding this comment

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

🥰

@joestringer joestringer merged commit 16ec0b2 into main Dec 13, 2023
64 of 85 checks passed
@joestringer joestringer deleted the pr/joe/workflow-gh-main branch December 13, 2023 17:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/ci This PR makes changes to the CI.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants