From 3c0756fb543cf801e20b35d6bf0b59ff9daaad20 Mon Sep 17 00:00:00 2001 From: barry-jin Date: Thu, 9 Sep 2021 15:52:51 -0700 Subject: [PATCH 1/6] fix website publish --- ci/docker/runtime_functions.sh | 2 +- docs/static_site/src/.asf.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 docs/static_site/src/.asf.yaml diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index e2702dd285e1..9163e821fb55 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1219,7 +1219,7 @@ build_docs() { # copy the full site for this version to versions folder mkdir -p html/versions/master - for f in 404.html api assets blog community ecosystem features feed.xml get_started index.html; do + for f in 404.html api assets blog community ecosystem features feed.xml get_started index.html .asf.yaml; do cp -r html/$f html/versions/master/ done diff --git a/docs/static_site/src/.asf.yaml b/docs/static_site/src/.asf.yaml new file mode 100644 index 000000000000..08e79d7999d8 --- /dev/null +++ b/docs/static_site/src/.asf.yaml @@ -0,0 +1,2 @@ +publish: + whoami: asf-site \ No newline at end of file From 3199a1218105784e1656c9152bb41cb72dde171c Mon Sep 17 00:00:00 2001 From: barry-jin Date: Thu, 9 Sep 2021 15:54:06 -0700 Subject: [PATCH 2/6] update --- docs/static_site/src/.asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/static_site/src/.asf.yaml b/docs/static_site/src/.asf.yaml index 08e79d7999d8..07355508b450 100644 --- a/docs/static_site/src/.asf.yaml +++ b/docs/static_site/src/.asf.yaml @@ -1,2 +1,2 @@ publish: - whoami: asf-site \ No newline at end of file + whoami: asf-site From 63ab88a73224eb6ca4c4d7dcbd11a910e81b8b45 Mon Sep 17 00:00:00 2001 From: barry-jin Date: Thu, 9 Sep 2021 16:50:34 -0700 Subject: [PATCH 3/6] remove .asf.yaml from version/master --- ci/docker/runtime_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 9163e821fb55..e2702dd285e1 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1219,7 +1219,7 @@ build_docs() { # copy the full site for this version to versions folder mkdir -p html/versions/master - for f in 404.html api assets blog community ecosystem features feed.xml get_started index.html .asf.yaml; do + for f in 404.html api assets blog community ecosystem features feed.xml get_started index.html; do cp -r html/$f html/versions/master/ done From f5f1538e7125bc7a879e09717967adff63c64752 Mon Sep 17 00:00:00 2001 From: barry-jin Date: Fri, 10 Sep 2021 16:20:09 -0700 Subject: [PATCH 4/6] force include .asf.yaml --- docs/static_site/src/_config_prod.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/static_site/src/_config_prod.yml b/docs/static_site/src/_config_prod.yml index a2a20363c355..798d603c219d 100644 --- a/docs/static_site/src/_config_prod.yml +++ b/docs/static_site/src/_config_prod.yml @@ -59,6 +59,11 @@ markdown: kramdown plugins: - jekyll-feed - jekyll-seo-tag + +# Force include .asf.yaml +include: + - .asf.yaml + # Exclude from processing. # The following items will not be processed, by default. Create a custom list # to override the default setting. From be504413e8d5d97e00b6fd50317fe24fa4c74de1 Mon Sep 17 00:00:00 2001 From: barry-jin Date: Mon, 13 Sep 2021 14:35:21 -0700 Subject: [PATCH 5/6] include .htaccess --- docs/static_site/src/_config_prod.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/static_site/src/_config_prod.yml b/docs/static_site/src/_config_prod.yml index 798d603c219d..0139f9e385d2 100644 --- a/docs/static_site/src/_config_prod.yml +++ b/docs/static_site/src/_config_prod.yml @@ -63,6 +63,7 @@ plugins: # Force include .asf.yaml include: - .asf.yaml + - .htaccess # Exclude from processing. # The following items will not be processed, by default. Create a custom list From a65dbf38995b95b08f3bf93cebd77f7b45487f47 Mon Sep 17 00:00:00 2001 From: barry-jin Date: Mon, 13 Sep 2021 14:56:10 -0700 Subject: [PATCH 6/6] add .asf.yaml check in CI --- ci/docker/runtime_functions.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index e2702dd285e1..e852daf0d259 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -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