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

Add --force-docs option #1879

Merged
merged 4 commits into from
Apr 14, 2022
Merged

Add --force-docs option #1879

merged 4 commits into from
Apr 14, 2022

Conversation

ebeahan
Copy link
Member

@ebeahan ebeahan commented Apr 14, 2022

Overview

Adds a new argument, --force-docs, to the generator script. This option forces the ECS docs (./docs dir) to be generated even if --subset, --include, or --exclude are also set.

Background

When --subset and --include flags were originally introduced, the generator would exit before generating the ./docs files. The ECS docs are purpose-formatted for Elastic's doc framework. Users generating custom artifacts with --include and/or --subset are unlikely to use ./docs as-is.

With the change introduced in #1847, the ECS docs aren't updating running make. The --force-docs option generates the ./docs directory even if these custom options are also set.

@ebeahan ebeahan requested a review from a team as a code owner April 14, 2022 16:15
@ebeahan ebeahan self-assigned this Apr 14, 2022
@ebeahan ebeahan merged commit 7c8cd17 into elastic:main Apr 14, 2022
@ebeahan ebeahan deleted the force-docs-flag branch April 14, 2022 17:45
ebeahan added a commit to ebeahan/ecs that referenced this pull request Apr 14, 2022
* add --force-docs flag

* document --force-docs

* include mixing doc updates

* changelog

(cherry picked from commit 7c8cd17)
ebeahan added a commit to ebeahan/ecs that referenced this pull request Apr 14, 2022
* add --force-docs flag

* document --force-docs

* include mixing doc updates

* changelog

(cherry picked from commit 7c8cd17)

# Conflicts:
#	docs/fields/fields.asciidoc
#	docs/index.asciidoc
@ebeahan
Copy link
Member Author

ebeahan commented Apr 14, 2022

💚 All backports created successfully

Status Branch Result
8.3
8.2

Questions ?

Please refer to the Backport tool documentation

ebeahan added a commit that referenced this pull request Apr 14, 2022
* Add `--force-docs` option (#1879)

* add --force-docs flag

* document --force-docs

* include mixing doc updates

* changelog

(cherry picked from commit 7c8cd17)

* fix version in docs
ebeahan added a commit that referenced this pull request Apr 14, 2022
* Add `--force-docs` option (#1879)

* add --force-docs flag

* document --force-docs

* include mixing doc updates

* changelog

(cherry picked from commit 7c8cd17)

* remove field from 8.2
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.

2 participants