Skip to content

Conversation

@karenzone
Copy link
Contributor

Sets up the docs build to pull from the "main" branch of the Logstash repo instead of the "master" branch.

Related: elastic/logstash#12052

@karenzone karenzone requested a review from lcawl November 5, 2021 00:02
@karenzone karenzone changed the title Switch Logstash repo from master to main Switch Logstash repo from master to main for doc builds Nov 5, 2021
Copy link
Member

@gtback gtback left a comment

Choose a reason for hiding this comment

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

Looks good to me!

We could temporarily create a main branch that's equivalent to master in order to test this (then remove it before doing the actual rename to keep the redirects GitHub will set up).

I'm assuming both logstash and logstash-docs will get renamed at the same time?


The VPR shouldn't be affected since it doesn't use the main or master branches. But I'm suprised how this ever worked without a map_branches since there's no versioned_plugin_docs branch in the docs repo:

          - title:      Logstash Versioned Plugin Reference
            prefix:     en/logstash-versioned-plugins
            current:    versioned_plugin_docs
            branches:   [ versioned_plugin_docs ]
            index:      docs/versioned-plugins/index.asciidoc
...
            sources:
              -
                repo:   logstash-docs
                path:   docs/versioned-plugins
              -
                repo:   docs
                path:   shared/attributes.asciidoc

@karenzone
Copy link
Contributor Author

I'm assuming both logstash and logstash-docs will get renamed at the same time?

Yes, that is the plan.

The VPR shouldn't be affected...

That's the logic I'm going on. The VPR lives on its own branch that's not named either master or main, so it should not be affected. But as we all know, the VPR is a sneaky little devil. :-D

Thanks for the reviews/comments/approvals, @lcawl and @gtback ❤️

@jsvd
Copy link
Member

jsvd commented Nov 8, 2021

@gtback @lcawl hi friend, I've just updated the elastic/logstash and elastic/logstash-docs master branch to main, can this be merged now?

@jsvd
Copy link
Member

jsvd commented Nov 8, 2021

@elasticmachine run elasticsearch-ci/docs

@jsvd jsvd merged commit 2b83a21 into elastic:master Nov 8, 2021
@karenzone karenzone deleted the ls-main branch November 8, 2021 13:45
@gtback
Copy link
Member

gtback commented Nov 8, 2021

Thanks for merging this, @jsvd !

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.

4 participants