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

[CI] add staging server CICD and prod branch workflow #2351

Merged
merged 1 commit into from
Jul 19, 2021

Conversation

jakehemmerle
Copy link
Contributor

@jakehemmerle jakehemmerle commented Jul 16, 2021

tl;dr: master doesn't deploy to prod anymore, prod does. master deploys to staging. Never merge anything other than master into prod. Or else.


Okay, we will now will have a staging server that we can test changes before we deploy to prod. Here is our new workflow (new steps in bold)

  • New commits are done on a new branch off of master and pushed to w3f/polkadot-wiki
  • A PR is put up for changes on that branch against master. Once approved etc, the changes are merged to master
  • CI/CD will automatically build and start the wiki on master viewable at https://w3f.github.io/polkadot-wiki-staging and https://w3f.github.io/kusama-guide-staging (these will be switched to https://staging.guide.kusama.network and https://staging.wiki.polkadot.network once I get DNS permissions). These changes will not be reflected on https://wiki.polkadot.network or https://guide.kusama.network yet.
    • Yes, the staging servers will look gross until get DNS figured out.
  • After testing the changes on the staging server, we can merge them into the prod. This can be most simply done via a PR from master to prod (also the best way if the rest of the team needs to see it), or this can just be merged and pushed locally.
    • To do this locally, pull the latest prod and master branches, merge master into prod, and push prod. CICD will pickup this change on prod, and build appropriately.**

I have created a new repo called w3f/polkadot-wiki-staging that handles the hosting of the test server (just like how w3f/kusama-guide-hosting hosts the Kusama Guide).

Still todo (but not blocking merge):

Copy link
Contributor

@salmad3 salmad3 left a comment

Choose a reason for hiding this comment

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

Many thanks @jakehemmerle

  • Workflow looks good.
  • For the staging servers, would there be something in the config that would allow for proper hosting on "w3f.github.io/..."? Because what if you actually wanted to use that DNS.
  • For the CI workflows, would changing the commands from "polkadot2:" and "kusama2:" to "polkadot:" and "kusama:" respectively, for prod and staging just be done in Update metadata in package.json to use default commands & Update README #2347?

@jakehemmerle
Copy link
Contributor Author

jakehemmerle commented Jul 16, 2021

  • For the staging servers, would there be something in the config that would allow for proper hosting on "w3f.github.io/..."? Because what if you actually wanted to use that DNS.

Yes but its gross and will require some custom parsing at the CICD level so I don't thinks worth doing since adding the DNS CNAME entry fixes this

yes, but there are two new files (staging for kusama andpolkadot ) that need to be changed that aren't part of that PR. I'll just merge that into this when it's done and we will be all set

@salmad3 salmad3 added the A2 - Please Review Pull request is ready for review. label Jul 16, 2021
@jakehemmerle
Copy link
Contributor Author

@DannyS03 ill merge after you merge cli renames

@jakehemmerle jakehemmerle merged commit 333463b into master Jul 19, 2021
@jakehemmerle jakehemmerle deleted the wikiops-dev-server branch July 19, 2021 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A2 - Please Review Pull request is ready for review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants