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

docs: Improve builds for Envoy and mobile (stamping) #29887

Merged
merged 1 commit into from
Oct 2, 2023

Conversation

phlax
Copy link
Member

@phlax phlax commented Sep 30, 2023

This removes docs/build.sh and limits the role of mobile/docs/build.sh

In the case of the first its now only used for presubmit testing, and for mobile it will be the same once we enable the new mobile docs site.

currently these scripts are required to set up the env for builds - this should happen in the genrule and use workspace stamping where appropriate. Removing them will make it easier to build both sets of docs as external targets without the need for these scripts or to simulate what they are doing

This should also make docs building much faster as it doesnt use action_env to set the docs config and expire all caches on every run

Commit Message:
Additional Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Fixes commit #PR or SHA]
[Optional Deprecated:]
[Optional API Considerations:]

@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Sep 30, 2023
@repokitteh-read-only
Copy link

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).
envoyproxy/dependency-shepherds assignee is @htuch

🐱

Caused by: #29887 was opened by phlax.

see: more, trace.

@phlax phlax changed the title docs/mobile: Improve builds (stamping) [WIP] docs/mobile: Improve builds (stamping) Sep 30, 2023
@phlax phlax marked this pull request as draft September 30, 2023 15:23
@phlax phlax force-pushed the docs-external branch 2 times, most recently from c875218 to adaf91b Compare September 30, 2023 15:38
@phlax phlax force-pushed the docs-external branch 8 times, most recently from 75d2cdc to b30a712 Compare October 2, 2023 06:57
mobile/docs/BUILD Show resolved Hide resolved
@phlax phlax force-pushed the docs-external branch 7 times, most recently from ae01e80 to 65ab4f6 Compare October 2, 2023 08:11
@repokitteh-read-only
Copy link

CC @envoyproxy/api-shepherds: Your approval is needed for changes made to (api/envoy/|docs/root/api-docs/).
envoyproxy/api-shepherds assignee is @mattklein123
CC @envoyproxy/api-watchers: FYI only for changes made to (api/envoy/|docs/root/api-docs/).

🐱

Caused by: #29887 was synchronize by phlax.

see: more, trace.

@phlax phlax force-pushed the docs-external branch 3 times, most recently from d69b054 to 8cc3d03 Compare October 2, 2023 09:59
@phlax phlax changed the title [WIP] docs/mobile: Improve builds (stamping) [WIP] docs: Improve builds for Envoy and mobile (stamping) Oct 2, 2023
@phlax
Copy link
Member Author

phlax commented Oct 2, 2023

/docs

@repokitteh-read-only
Copy link

Docs for this Pull Request will be rendered here:

https://storage.googleapis.com/envoy-pr/29887/docs/index.html

The docs are (re-)rendered each time the CI envoy-presubmit (precheck docs) job completes.

🐱

Caused by: a #29887 (comment) was created by @phlax.

see: more, trace.

@phlax phlax force-pushed the docs-external branch 2 times, most recently from 8543a17 to 801229e Compare October 2, 2023 10:27
@phlax phlax changed the title [WIP] docs: Improve builds for Envoy and mobile (stamping) docs: Improve builds for Envoy and mobile (stamping) Oct 2, 2023
@phlax phlax marked this pull request as ready for review October 2, 2023 10:28
@adisuissa adisuissa self-assigned this Oct 2, 2023
Copy link
Contributor

@adisuissa adisuissa left a comment

Choose a reason for hiding this comment

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

Thanks, overall LGTM, minor comments/suggestions.

@@ -246,11 +246,15 @@ pkg_tar(
genrule(
name = "html_release",
outs = ["html_release.tar.gz"],
# BUILD_SHA must be set in release builds
Copy link
Contributor

Choose a reason for hiding this comment

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

Will/can the script fail if it is not set?

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah it will - bazel enforces set env vars so it fails

Copy link
Member Author

Choose a reason for hiding this comment

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

(ditto re too many vars)

# The full version, including alpha/beta/rc tags.
release = os.environ['ENVOY_DOCS_VERSION_STRING']
release = version
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems there's a mismatch between the description (comment) of release and version described 4 lines above, though both should be the same.

Copy link
Member Author

Choose a reason for hiding this comment

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

there are too many vars here - in this PR im doing the minimum to get things working but happy to remove some of this superflous code in a follow up

fwiw - in a follow up - this will no longer happen here anyway i think - at least in relation to publishing (rather than testing)

Copy link
Member Author

Choose a reason for hiding this comment

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

hmm actually realizing this is the code that will be triggered still - so this wont be moved - but it is my intention to clean this up

Copy link
Contributor

Choose a reason for hiding this comment

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

SGTM.
Next time I suggest adding a TODO, but no need for it in this PR.

Copy link
Contributor

@adisuissa adisuissa left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

# The full version, including alpha/beta/rc tags.
release = os.environ['ENVOY_DOCS_VERSION_STRING']
release = version
Copy link
Contributor

Choose a reason for hiding this comment

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

SGTM.
Next time I suggest adding a TODO, but no need for it in this PR.

@phlax phlax merged commit d3a226c into envoyproxy:main Oct 2, 2023
119 checks passed
phlax added a commit to phlax/envoy that referenced this pull request Oct 3, 2023
phlax added a commit to phlax/envoy that referenced this pull request Oct 3, 2023
phlax added a commit that referenced this pull request Oct 3, 2023
phlax added a commit that referenced this pull request Oct 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api deps Approval required for changes to Envoy's external dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants