Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[Website] Fix website publish #20573

Merged
merged 6 commits into from
Sep 14, 2021
+14 −1
Merged

[Website] Fix website publish #20573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c0756f
fix website publish
barry-jin Sep 9, 2021
3199a12
update
barry-jin Sep 9, 2021
63ab88a
remove .asf.yaml from version/master
barry-jin Sep 9, 2021
f5f1538
force include .asf.yaml
barry-jin Sep 10, 2021
be50441
include .htaccess
barry-jin Sep 13, 2021
a65dbf3
add .asf.yaml check in CI
barry-jin Sep 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ci/docker/runtime_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,12 @@ build_docs() {
mkdir -p $python_doc_folder && tar -xzf python-artifacts.tgz --directory $python_doc_folder
mkdir -p $api_folder/cpp/docs/api && tar -xzf c-artifacts.tgz --directory $api_folder/cpp/docs/api

# check if .htaccess file exists
# check if .asf.yaml file exists
if [ ! -f "html/.asf.yaml" ]; then
echo "html/.asf.yaml file does not exist. Exiting 1"
exit 1
fi
# check if .htaccess file exists
if [ ! -f "html/.htaccess" ]; then
echo "html/.htaccess file does not exist. Exiting 1"
exit 1
Expand Down
2 changes: 2 additions & 0 deletions docs/static_site/src/.asf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
publish:
whoami: asf-site
6 changes: 6 additions & 0 deletions docs/static_site/src/_config_prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ markdown: kramdown
plugins:
- jekyll-feed
- jekyll-seo-tag

# Force include .asf.yaml
include:
- .asf.yaml
- .htaccess
Copy link
Contributor

Choose a reason for hiding this comment

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

why are we adding this? it was already included in Jekyll build.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The log shows html/.htaccess is not included during building jekyll docs.
https://jenkins.mxnet-ci.amazon-ml.com/blue/organizations/jenkins/restricted-website-build-master-beta/detail/restricted-website-build-master-beta/5/pipeline/219

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Probably because we update the include in config, which overrides the default config that includes .htaccess

Copy link
Contributor

Choose a reason for hiding this comment

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

thanks. that makes sense. can we also add a similar check for .asf.yaml here?
https://github.com/apache/incubator-mxnet/blob/e359bcd65e453d4bc86d3d8e5b1dee3916a2e426/ci/docker/runtime_functions.sh#L1207


# Exclude from processing.
# The following items will not be processed, by default. Create a custom list
# to override the default setting.
Expand Down