Sync Main and Staging branches -> sync "production" and "preview" builds

RichieEscarez commented 3 years ago

A step I forgot to mention for the Docs release process: git reset --hard upstream/main

A regular task that needs to be done is to sync the Main and Staging branches.

Re: How docs builds work: https://knative.slack.com/archives/C9CV04DNJ/p1614635312040400

This add more detail around how the webhooks work:

The way we are running builds (telling Netlify which build to run) is through GitHub webhooks. 

There are two:

 * one that triggers a "production" build - any PR that gets merged

['main' branch of knative/website]

* one that triggers a "preview" build - any PR action other than a merge (ie. commit, comment, label, etc)

['staging' branch of knative/website]

Netlify is configured to only run a "production" build if that build is from the 'main' branch of knative/website. The 'staging' branch in knative/website is the build that all PRs run ("preview" builds). The webhooks sent from knative/docs are simply configured to indicate which knative/website branch to use for each build.

More info: The build configuration for "preview" builds are here and here, which builds the site from the PR owners single branch and fork only. Therefore, the knative/website branches can drift out of sync without negative affects but I try not to let them drift too far.

RichieEscarez commented 3 years ago

/hold

We should sync this PR too: https://github.com/knative/website/pull/263

RichieEscarez commented 3 years ago

@evankanderson this should be ready to go and will fix all the PR builds too (re: master/main rename): https://app.netlify.com/sites/knative/deploys

RichieEscarez commented 3 years ago

Friendly ping.

Can someone please help merge this (merge conflict resolution is becoming a time sink)?

vaikas commented 3 years ago

/lgtm /approve

knative-prow-robot commented 3 years ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: omerbensaadon, vaikas

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/knative/website/blob/staging/OWNERS)~~ [vaikas] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

knative / website

Sync Main and Staging branches -> sync "production" and "preview" builds #260