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

[8.16] [OAS] Publish OAS bundles to bump.sh (#197482) #200136

Merged
merged 9 commits into from
Nov 27, 2024

Conversation

jloleysens
Copy link
Contributor

Backport

This will backport the following commits from main to 8.16:

Questions ?

Please refer to the Backport tool documentation

## Summary

Publish OAS docs to bump.sh on merge to `main` or `8.x`

## To reviewers
* For now actual publication requires a manual step on bump.sh (so
things aren't going live immediately)
* Will get to serverless OAS docs next!

## Blockers

* Address vulnerable deps before merging:
bump-sh/cli#583

---------

Co-authored-by: kibanamachine <[email protected]>
(cherry picked from commit 8278b06)

# Conflicts:
#	oas_docs/makefile
#	oas_docs/output/kibana.serverless.yaml
#	oas_docs/output/kibana.yaml
@jloleysens jloleysens requested a review from a team as a code owner November 14, 2024 10:13
@jloleysens jloleysens enabled auto-merge (squash) November 14, 2024 10:13
@jloleysens jloleysens disabled auto-merge November 14, 2024 10:13
@jloleysens
Copy link
Contributor Author

@elasticmachine merge upstream

exit 0;
fi

if [[ "$BUILDKITE_BRANCH" == "8.x" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

if [[ "$BUILDKITE_BRANCH" == "8.x" ]]; then

I presume in this branch we'll need to add another clause like this, but for the 8.16 branch and targeting the "v8" branch in Bump.sh

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, that's a good point... this step won't do anything on this branch.

One alternative for back port branches: we could "set and forget" to e.g. 8.16. But I guess that would mean a lot more branches on bump. Perhaps worth leaving out this back port for now. Wdyt?

Copy link
Contributor

Choose a reason for hiding this comment

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

Since it looks like we have at least one more 8.16 release before 8.17 takes over, I'm leaning toward having the clause in here to publish to the v8 branch. The docs team just needs to remember to comment it out when it comes time to switch to 8.17.

Copy link
Contributor

Choose a reason for hiding this comment

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

I've added an 8.16 section in d90c609

Copy link
Contributor Author

Choose a reason for hiding this comment

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

++ that sounds good, we'll have to change the check to 8.17 on that branch

@jloleysens jloleysens enabled auto-merge (squash) November 26, 2024 09:28
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

@jloleysens jloleysens merged commit b3d1d7a into elastic:8.16 Nov 27, 2024
8 checks passed
@jloleysens jloleysens deleted the backport/8.16/pr-197482 branch November 27, 2024 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants