Prepare for v1.15 development cycle #26516
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
joestringer
added
the
release-note/misc
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
giorio94
reviewed
Jun 28, 2023
51 tasks
jschwinger233
approved these changes
Jun 30, 2023
nbusseneau
requested changes
Jun 30, 2023
There was a problem hiding this comment.
Discussed with Joe offline:
- Since we are close to merging ci: use Ariane to trigger workflows #26237, we will merge it first before branching off as it will simplify the process considerably.
- In particular, for this PR it means we do not need to make copies of the workflows for 1.14. Instead, workflows for 1.14 will live directly on the 1.14 branch. This is handled as part of v1.14: ci: use Ariane to trigger workflows #26625.
joestringer
force-pushed
the
pr/joe/v1.15-prep
branch
from
a8c044c
to
127d2b3
Compare
nbusseneau
approved these changes
Jul 6, 2023
| @@ -19,6 +19,6 @@ jobs: | |||
| - uses: docker://quay.io/cilium/scruffy:v0.0.3@sha256:ca997451b739cbf03c204cb2523a671c31c61edc606aa5d20dc3560bc7f25bc7 | |||
| with: | |||
| entrypoint: scruffy | |||
| args: --git-repository=./ --stable-branches=origin/main,origin/v1.9,origin/v1.10,origin/v1.11,origin/v1.12,origin/v1.13 | |||
| args: --git-repository=./ --stable-branches=origin/main,origin/v1.9,origin/v1.10,origin/v1.11,origin/v1.12,origin/v1.13,origin/v1.14 | |||
There was a problem hiding this comment.
[Nit] Should we remove v1.9 and v1.10 from here?
There was a problem hiding this comment.
Yeah we probably should. I have another PR in the works to drop all 1.11 or earlier references, which should wait until the release. I can add this change into that one.
| @@ -14,26 +14,31 @@ on: | |||
| - Cilium L4LB XDP (ci-l4lb-1.11) | |||
| - Cilium L4LB XDP (ci-l4lb-1.12) | |||
| - Cilium L4LB XDP (ci-l4lb-1.13) | |||
| - Cilium L4LB XDP (ci-l4lb-1.14) | |||
There was a problem hiding this comment.
[Useless nit] The ci-xxx-1.xx workflows do not exist anymore, now it's only the regular non -1.xx versions for all branches. Not that it matters considering Loki is disabled anyway...
There was a problem hiding this comment.
Yeah I was debating if we should just be deleting the loki workflow instead.
squeed
approved these changes
Jul 6, 2023
lambdanis
approved these changes
Jul 6, 2023
viktor-kurchenko
approved these changes
Jul 6, 2023
tklauser
requested changes
Jul 6, 2023
nathanjsweet
approved these changes
Jul 6, 2023
Signed-off-by: Joe Stringer <joe@cilium.io>
joestringer
force-pushed
the
pr/joe/v1.15-prep
branch
from
127d2b3
to
72064d9
Compare
tklauser
approved these changes
Jul 6, 2023
aanm
approved these changes
Jul 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on: #26237 (which introduces per-branch comment-trigger workflows, so this PR doesn't need them)
This should be merged once we prepare the v1.14 branch.
Differences from the previous dev cycle preparation PR:
v1.15-devversion during the dev cycle.