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

merge master into rt #800

Merged
merged 5 commits into from
Jul 23, 2024
Merged

merge master into rt #800

merged 5 commits into from
Jul 23, 2024

Conversation

lsf37
Copy link
Member

@lsf37 lsf37 commented Jul 23, 2024

This brings in the mcs manifest deployment and mcs bump script option from master.

bump-ver-manifest now takes an optional parameter `--mcs` to operate
on `mcs-devel.xml` instead of `devel.xml`.

Signed-off-by: Gerwin Klein <[email protected]>
Python 3.12 complains about `\<` not being a legal escape sequence. Use
raw string instead.

Signed-off-by: Gerwin Klein <[email protected]>
Add deployment of the mcs-devel.xml manifest to mcs.xml.

The pattern is to use the branch name in `github.ref` as a guard in the
initial code freeze action, and then make any subsequent actions depend
on either `code` or `mcs-code`, respectively.

All of this lives on the master branch (but does trigger on pushes to
`rt`), so that it can in the future also trigger on manifest updates
from `repository_dispatch` events.

Currently the latter does not happen yet, because `github.ref` will be
`refs/head/master` for `repository_dispatch` events, so only the main
deployment job runs for those.

Signed-off-by: Gerwin Klein <[email protected]>
@lsf37 lsf37 self-assigned this Jul 23, 2024
Copy link
Member

@corlewis corlewis left a comment

Choose a reason for hiding this comment

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

Should the last commit here have a rt tag? It probably won't matter in this case but those tags do help in the future when merging or looking at the history for whatever reason.

@lsf37
Copy link
Member Author

lsf37 commented Jul 23, 2024

You're right, will add one.

The push trigger on the PR actual was used previously for the `rt`
branch. Branch testing is now on the main deployment action.

Signed-off-by: Gerwin Klein <[email protected]>
@lsf37 lsf37 merged commit 3fb6dcd into rt Jul 23, 2024
8 of 11 checks passed
@lsf37 lsf37 deleted the rt-merge-workflows branch July 23, 2024 02:12
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.

2 participants