Bring in latest main changes (#6759) · keystonejs/keystone@2423f3b

vercel · 2021-10-11T02:15:16Z

Successfully deployed to the following URLs:

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
       "$schema": "https://unpkg.com/@changesets/config@0.2.1/schema.json",
       "changelog": ["@changesets/changelog-github", { "repo": "keystonejs/keystone" }],
       "commit": false,
+      "baseBranch": "main",
       "linked": [],
       "access": "public"
     }

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Release @@
     on:
       push:
         branches:
-          - master
+          - main
     jobs:
       release:
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: CI @@
     on:
       push:
         branches:
-          - master
+          - main
       pull_request:
     jobs:
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     ##### Update Packages (automatic)
     This step is handled for us by the Changesets GitHub Action. As PRs are opened
-    against `master`, the bot will open and update a PR which generates the
+    against `main`, the bot will open and update a PR which generates the
     appropriate `CHANGELOG.md` entries and `package.json` version bumps.
-    Once ready for a release, merge the bot's PR into `master`.
+    Once ready for a release, merge the bot's PR into `main`.
     > _NOTE: For information on manually updating packages, see [Update Packages
     > (manual)](#update-packages-manual)_
     ##### Publish Packages
-    Once the version changes are merged back in to master, to do a manual release:
+    Once the version changes are merged back in to main, to do a manual release:
     ```sh
     yarn fresh && \
@@ Expand All @@
     The commands to run are:
     ```sh
-    git checkout master && \
+    git checkout main && \
     git pull && \
     git branch -D temp-release-branch && \
     git checkout -b temp-release-branch && \
@@ Expand All / @@ -136,12 +136,12 @@ git commit -m "Version packages" && \ @@
     git push --set-upstream origin temp-release-branch
     ```
-    Once you have run this you will need to make a pull request to merge this back into master.
+    Once you have run this you will need to make a pull request to merge this back into main.
     Finally, make sure you've got the latest of everything locally
     ```sh
-    git checkout master && \
+    git checkout main && \
     git pull && \
     yarn
     ```
@@ Expand Down Expand Up @@
 . Do _NOT_ open a PR
-       This change is not going to be PR'd into master. Instead we'll later push
+       This change is not going to be PR'd into main. Instead we'll later push
        the tag which contains the commits.
        To confirm everything is as expected, look at the git log:
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     ## npm release
-    Merge the PR named `Version Packages` into `master` on GitHub once tests are passing.
+    Merge the PR named `Version Packages` into `main` on GitHub once tests are passing.
-    Get latest from `master`:
+    Get latest from `main`:
     ```sh
     git pull
@@ Expand All / @@ -26,25 +26,13 @@ yarn publish-changed @@
     ## GitHub tags
-    Publish all new tags to GitHub:
-    ```sh
-    git push --tags
-    ```
-    Checkout merge commit as a result of the `Version Packages` PR:
-    ```sh
-    git checkout sha123
-    ```
     Create git tag relevant to release date:
     ```sh
     git tag -a "YYYY-MM-DD" -m "YYYY-MM-DD"
     ```
-    Push tag to GitHub:
+    Publish all new tags (releases plus release date version) to GitHub:
     ```sh
     git push --tags
@@ Expand Down Expand Up @@
     Add release to release page index under `/docs/pages/releases/index.mdx` with a summarised heading.
-    Commit website update and open PR to add to `master`.
+    Commit website update and open PR to add to `main`.
-    Have PR reviewed and merged into `master`.
+    Have PR reviewed and merged into `main`.
     ## GitHub branch sync
-    When we do a release we need to make sure `master` and `website_live` are both in sync with each other, this is done by:
+    When we do a release we need to make sure `main` and `website_live` are both in sync with each other, this is done by:
-    Creating a branch off `master` such as `bring-in-latest-website-changes` and merging in `website_live` changes, opening a PR and getting it merged, example - <https://github.com/keystonejs/keystone/pull/6470>
+    Creating a branch off `main` such as `bring-in-latest-website-changes` and merging in `website_live` changes, opening a PR and getting it merged, example - <https://github.com/keystonejs/keystone/pull/6470>
-    Then the other way around, create a branch off `website_live` such as `bring-in-latest-master-changes`, and merging in `master` changes, opening a PR and getting it merged, example - <https://github.com/keystonejs/keystone/pull/6472>
+    Then the other way around, create a branch off `website_live` such as `bring-in-latest-main-changes`, and merging in `main` changes, opening a PR and getting it merged, example - <https://github.com/keystonejs/keystone/pull/6472>
     Once this is done, the histories will be out of sync, GitHub will state that `website_live` is still x commits behind, if you look at the branches page - <https://github.com/keystonejs/keystone/branches>
@@ Expand All / @@ -177,21 +165,21 @@ Go to the `website_live` branch @@
     `git checkout website_live`
-    Check that we're identical to master
+    Check that we're identical to main
-    `git diff master`
+    `git diff main`
     Do a merge that should just update the parents of the new commit
-    `git merge master`
+    `git merge main`
     This should be empty
     `git diff origin/website_live`
     This should be empty
-    `git diff master`
+    `git diff main`
     Force push `website_live` (after turning off branch protection in github)
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

1 comment on commit `2423f3b`

vercel bot commented on `2423f3b` Oct 11, 2021

Commit

There are no files selected for viewing

1 comment on commit 2423f3b

vercel bot commented on 2423f3b Oct 11, 2021

Choose a reason for hiding this comment

1 comment on commit `2423f3b`

vercel bot commented on `2423f3b` Oct 11, 2021