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

#1932 Publish v13 Docs using mike #1967

Merged
merged 19 commits into from
Jun 5, 2024
Merged

Conversation

srikant-ch5
Copy link
Contributor

@srikant-ch5 srikant-ch5 commented May 20, 2024

Fixes: #1932 , #1895

Developer's Certificate of Origin 1.1

   By making a contribution to this project, I certify that:

   (a) The contribution was created in whole or in part by me and I
       have the right to submit it under the Apache License 2.0; or

   (b) The contribution is based upon previous work that, to the best
       of my knowledge, is covered under an appropriate open source
       license and I have the right under that license to submit that
       work with modifications, whether created in whole or in part
       by me, under the same open source license (unless I am
       permitted to submit under a different license), as indicated
       in the file; or

   (c) The contribution was provided directly to me by some other
       person who certified (a), (b) or (c) and I have not modified
       it.

   (d) I understand and agree that this project and the contribution
       are public and that a record of the contribution (including all
       personal information I submit with it, including my sign-off) is
       maintained indefinitely and may be redistributed consistent with
       this project or the open source license(s) involved.

@srikant-ch5 srikant-ch5 requested a review from tomlyn May 20, 2024 14:29
Copy link
Member

@tomlyn tomlyn left a comment

Choose a reason for hiding this comment

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

I made this comment elsewhere but it seems to have disappeared: Previously we had to check with our release manager (Anita Chiu) if it was OK to introduce a new package into Elyra Canvas. Have you mentioned this to Anita?

@tomlyn
Copy link
Member

tomlyn commented May 20, 2024

Also, the README will need to be updated with new instructions on what to run -- just like we did when mkdocs was introduced.

@srikant-ch5
Copy link
Contributor Author

Also, the README will need to be updated with new instructions on what to run -- just like we did when mkdocs was introduced.

Hi @tomlyn I have updated README and we have also got approval from Anita Chiu on slack.

@srikant-ch5 srikant-ch5 requested a review from tomlyn May 21, 2024 06:01
@tomlyn
Copy link
Member

tomlyn commented May 22, 2024

This looks good to me. My only thought is can we style the dropdown to have a black background?

I think we should also get @matthoward366 's approval before merging it in.

Matt, are you OK with this? I'm am still a little unsure how we are going to use this. It's no use to switch between v12 and v13 and it might be a very long time before we go to v14 so are we going to add a new entry to the drop down for every minor release of v13 (v13.1, v13.2, etc) ?

Tagging @JesusGuerrero in case he has some input.

@matthoward366
Copy link
Member

We wouldn't have doc versions for each minor release.

I'm curious how this works in the future. When we do create a 14 version are there changes need in both 13 and 14 branches to make this work?

@srikant-ch5
Copy link
Contributor Author

srikant-ch5 commented May 23, 2024

When we do create a 14 version are there changes need in both 13 and 14 branches to make this work?

Hi @matthoward366 When we create 14 version then only changes to one branch is enough. Only thing we need to change is in deploy-docs.yml file update run: mike deploy to v14 which will deploy all the changes in docs folder to a separate folder in gh-pages and similarly need to create a separate folder for v13

@tomlyn I have updated docs to include dropdown with black background.

@matthoward366
Copy link
Member

similarly need to create a separate folder for v13

Would this be on main or the v13 branch? If we make changes in the v13 branch will that update the documentation?

README.md Outdated
mike set-default v13

# This command will create a folder named as v12.x in gh-pages branch.
mike deploy --push --update-aliases v12.x
Copy link
Member

Choose a reason for hiding this comment

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

What is this for?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is to create initial setup in gh-pages which will create a folder named v12.x and place all the doc changes in it. So when we select on v12.x from dropdown it will fetch docs from this folder.

Copy link
Member

Choose a reason for hiding this comment

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

Since we won't have v12 docs should this be removed?

Copy link
Contributor Author

@srikant-ch5 srikant-ch5 May 23, 2024

Choose a reason for hiding this comment

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

Yes this can be removed if there is no v12 docs. Should I remove this ?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, I think we should. @tomlyn do you agree?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure. I have removed that from Readme.

@matthoward366
Copy link
Member

It's still not clear to me how this is going to work for the different branches and how each branch documentation is going to maintained.

@srikant-ch5
Copy link
Contributor Author

It's still not clear to me how this is going to work for the different branches and how each branch documentation is going to maintained.

@matthoward366 If we want to use mkdocs versioning for different branches we must have changes from this PR in all the branches with mike deploy command consisting branch name.

@matthoward366
Copy link
Member

When we create a new v13 branch can you give me the steps needed?
What changes are needed on main and v13?
If we make a change in the v13 docs how does that work?

@srikant-ch5
Copy link
Contributor Author

When we create a new v13 branch can you give me the steps needed? What changes are needed on main and v13? If we make a change in the v13 docs how does that work?

-If there is a new v13 branch which is derived from current main then no changes are needed in it as current main branch will already have deploy-docs.yml deploy command as mike deploy --push --update-aliases v13.

-Changes should be made in main branch (v14) by updating deploy-docs.yml file as mike deploy --push --update-aliases v14 latest. Here we have changed latest to v14.

so https://elyra-ai.github.io/canvas/v14 and https://elyra-ai.github.io/canvas/latest will navigate to same v14 docs.

@tomlyn
Copy link
Member

tomlyn commented May 23, 2024

Hi @srikant-ch5
I noticed that with mike serve running I am no longer able to edit a .md file and then see the changes immediately reflected in the browser like I was able to do when running mkdocs serve. Is that a restriction with mike? If so it might be worth mentioning in the readme that developers working on the docs should just run mkdocs serve.

@srikant-ch5
Copy link
Contributor Author

Hi @srikant-ch5 I noticed that with mike serve running I am no longer able to edit a .md file and then see the changes immediately reflected in the browser like I was able to do when running mkdocs serve. Is that a restriction with mike? If so it might be worth mentioning in the readme that developers working on the docs should just run mkdocs serve.

Hi @tomlyn I have updated readme with mkdocs serve command.

README.md Outdated
# Test changes in local.
mike serve

# If above command doesn't reflect any changes made to docs please run below mkdocs command
Copy link
Member

@tomlyn tomlyn May 24, 2024

Choose a reason for hiding this comment

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

Can you write this as: "If you are working on Elyra Canvas documentation content, you should run the following command, instead of the mike serve command, to see your changes immediately reflected in the browser."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, I have updated accordingly.

@srikant-ch5 srikant-ch5 requested a review from tomlyn May 24, 2024 18:05
@srikant-ch5 srikant-ch5 self-assigned this May 28, 2024
@srikant-ch5
Copy link
Contributor Author

Hi @tomlyn any update on this PR, any changes needs to be done here ?

@tomlyn
Copy link
Member

tomlyn commented May 31, 2024

@srikant-ch5 It looks good to me but I think we should wait until @matthoward366 is happy. He is currently away and back on Tuesday June 4th.

Copy link
Member

@matthoward366 matthoward366 left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link
Member

@tomlyn tomlyn left a comment

Choose a reason for hiding this comment

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

LGTM

@tomlyn tomlyn merged commit e809d7c into elyra-ai:main Jun 5, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Publish v13 Docs at different URL
3 participants