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
Merged

[Website] Fix website publish #20573

merged 6 commits into from
Sep 14, 2021

Conversation

barry-jin
Copy link
Contributor

@barry-jin barry-jin commented Sep 9, 2021 •
edited
Loading

Description

Add .asf.yaml

@mseth10 @szha

Checklist

Essentials

  • PR's title starts with a category (e.g. [BUGFIX], [MODEL], [TUTORIAL], [FEATURE], [DOC], etc)
  • Changes are complete (i.e. I finished coding on this PR)
  • All changes have test coverage
  • Code is well-documented

Changes

  • Feature1, tests, (and when applicable, API doc)
  • Feature2, tests, (and when applicable, API doc)

Comments

  • If this change is a backward incompatible change, why must this change be made.
  • Interesting edge cases to note here

@mxnet-bot
Copy link

Hey @barry-jin , Thanks for submitting the PR
All tests are already queued to run once. If tests fail, you can trigger one or more tests again with the following commands:

  • To trigger all jobs: @mxnet-bot run ci [all]
  • To trigger specific jobs: @mxnet-bot run ci [job1, job2]

CI supported jobs: [edge, website, unix-cpu, sanity, windows-gpu, windows-cpu, centos-gpu, centos-cpu, unix-gpu, clang, miscellaneous]

Note:
Only following 3 categories can trigger CI :PR Author, MXNet Committer, Jenkins Admin.
All CI tests must pass before the PR can be merged.

@mseth10 mseth10 added the pr-awaiting-testing PR is reviewed and waiting CI build and test label Sep 9, 2021
waytrue17
waytrue17 reviewed Sep 9, 2021
View reviewed changes
ci/docker/runtime_functions.sh Outdated
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

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

The .asf.yaml would already be in html/. Do we need to copy it to html/versions/master?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for pointing it out. If .asf.yaml is already in html/ then we do not need to pack it into versions/master again.

@mseth10 mseth10 added pr-work-in-progress PR is still work in progress pr-awaiting-testing PR is reviewed and waiting CI build and test and removed pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress labels Sep 10, 2021
@barry-jin
Copy link
Contributor Author

@mxnet-bot run ci [centos-cpu, unix-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu, centos-cpu]

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-awaiting-review PR is waiting for code review and removed pr-work-in-progress PR is still work in progress pr-awaiting-testing PR is reviewed and waiting CI build and test labels Sep 10, 2021
@mseth10
Copy link
Contributor

mseth10 commented Sep 10, 2021

Ran the beta pipeline on this PR branch https://jenkins.mxnet-ci.amazon-ml.com/blue/organizations/jenkins/restricted-website-build-master-beta/detail/restricted-website-build-master-beta/4/pipeline
Changes should be reflected here: https://github.com/apache/incubator-mxnet-site/tree/beta-site

@mseth10
Copy link
Contributor

mseth10 commented Sep 10, 2021

@barry-jin I dont think jekyll build is picking up .asf.yaml file https://jenkins.mxnet-ci.amazon-ml.com/blue/rest/organizations/jenkins/pipelines/restricted-website-build-master-beta/runs/4/nodes/113/steps/153/log/?start=0

So it's not published to incubator-mxnet-site

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test and removed pr-awaiting-review PR is waiting for code review labels Sep 10, 2021
@barry-jin
Copy link
Contributor Author

I'm forcing inclusion of .asf.yaml because dotfiles are excluded by default. reference: https://jekyllrb.com/docs/configuration/options/

@mseth10 mseth10 added pr-work-in-progress PR is still work in progress and removed pr-awaiting-testing PR is reviewed and waiting CI build and test labels Sep 10, 2021
@barry-jin
Copy link
Contributor Author

@mxnet-bot run ci [centos-gpu, unix-cpu, unix-gpu, website]

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress and removed pr-awaiting-testing PR is reviewed and waiting CI build and test labels Sep 13, 2021
@szha
Copy link
Member

szha commented Sep 13, 2021

@mxnet-bot run ci [unix-cpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-cpu]

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test and removed pr-work-in-progress PR is still work in progress labels Sep 13, 2021
mseth10
mseth10 reviewed Sep 13, 2021
View reviewed changes
docs/static_site/src/_config_prod.yml
# 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

@mseth10
Copy link
Contributor

mseth10 commented Sep 13, 2021

https://jenkins.mxnet-ci.amazon-ml.com/blue/organizations/jenkins/restricted-website-build-master-beta/detail/restricted-website-build-master-beta/6/pipeline

@mseth10 mseth10 added pr-work-in-progress PR is still work in progress and removed pr-awaiting-testing PR is reviewed and waiting CI build and test labels Sep 13, 2021
@barry-jin
Copy link
Contributor Author

https://jenkins.mxnet-ci.amazon-ml.com/blue/organizations/jenkins/restricted-website-build-master-beta/detail/restricted-website-build-master-beta/6/pipeline

Looks like the final step of publishing website in beta-pipeline is using the artifact from "restricted-website-build-master" instead of "restricted-website-build-master-beta". But I have checked the logs and .asf.yaml is already packed in the artifact.

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test and removed pr-work-in-progress PR is still work in progress labels Sep 14, 2021
@mseth10 mseth10 added pr-work-in-progress PR is still work in progress and removed pr-awaiting-testing PR is reviewed and waiting CI build and test labels Sep 14, 2021
@barry-jin
Copy link
Contributor Author

@mxnet-bot run ci [centos-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [centos-gpu]

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-awaiting-merge Review and CI is complete. Ready to Merge and removed pr-work-in-progress PR is still work in progress pr-awaiting-testing PR is reviewed and waiting CI build and test labels Sep 14, 2021
@barry-jin barry-jin merged commit 98e6b36 into apache:master Sep 14, 2021
@barry-jin barry-jin deleted the website-publish branch September 14, 2021 05:29
NathanYyc pushed a commit to NathanYyc/incubator-mxnet that referenced this pull request Sep 16, 2021
@barry-jin @NathanYyc
[Website] Fix website publish (apache#20573)
da94ffb 
* fix website publish

* update

* remove .asf.yaml from version/master

* force include .asf.yaml

* include .htaccess

* add .asf.yaml check in CI
barry-jin added a commit that referenced this pull request Oct 14, 2021
@NathanYyc @barry-jin
[API Standardization]Standardize MXNet NumPy Statistical & Linalg Fun…
ab6a3f9 
…ctions (#20592)

* [Website] Fix website publish (#20573)

* fix website publish

* update

* remove .asf.yaml from version/master

* force include .asf.yaml

* include .htaccess

* add .asf.yaml check in CI

* change linalg & statical funcs

* add vecdot

* changes made

* changes made

* changes made

* changes made

* delete test vecdot

* fixed lint
add radd rand ror rxor

* fixed lint error

* fixed lint error

* fixed problems

* delete 'vecdot' in __all__

* fixed acosh doc

* fixed tensordot bug
add vecdot notes

* add line in line 58

* add line in line 4254

* add line in 5423,9080 in multiarray
add line in 260 in test_numpy_op

* Update python/mxnet/numpy/multiarray.py

Co-authored-by: Zhenghui Jin <69359374+barry-jin@users.noreply.github.com>

* solve typo

* add wrap_data_api_linalg_func in line 1335 & 1205

Co-authored-by: Zhenghui Jin <69359374+barry-jin@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@waytrue17 waytrue17 waytrue17 left review comments

@mseth10 mseth10 mseth10 approved these changes

@szha szha szha approved these changes

@aaronmarkham aaronmarkham Awaiting requested review from aaronmarkham aaronmarkham is a code owner

@marcoabreu marcoabreu Awaiting requested review from marcoabreu marcoabreu is a code owner

Assignees
No one assigned
Labels
pr-awaiting-merge Review and CI is complete. Ready to Merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@barry-jin @mxnet-bot @mseth10 @szha @waytrue17