@workday/canvas-kit-docs 8.0.9 → 8.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -162,66 +162,76 @@ completed, the following will happen:
162
162
  - `prerelease/minor`: v5 -> v6
163
163
  - `prerelease/major`: v6 -> v7
164
164
 
165
- Before starting the next steps, make sure to fetch upstream.
165
+ Before starting the next steps, we need to disable some CI jobs
166
+ ([Disabling Workflow Docs](https://docs.github.com/en/actions/managing-workflow-runs/disabling-and-enabling-a-workflow)).
166
167
 
167
- ```sh
168
- git fetch upstream
169
- ```
170
-
171
- 1. Update `support` to point to the current major version `master` is currently pointing to. We need
172
- an empty commit with [no-release] to skip the normal release process on the support branch. If we
173
- don't add this commit, the job will fail to create an npm version that is already published.
168
+ - [Canary](https://github.com/Workday/canvas-kit/actions/workflows/canary.yml)
169
+ - [forward-merge](https://github.com/Workday/canvas-kit/actions/workflows/forward-merge.yml)
170
+ - [Release](https://github.com/Workday/canvas-kit/actions/workflows/release.yml)
174
171
 
175
- ```sh
176
- git checkout support
177
- git pull upstream support
178
- git pull upstream master
179
- git commit --allow-empty --no-verify -m "Bump support to next major version [skip release]"
180
- git push upstream support
181
- ```
172
+ These jobs will only cause problems during the release cycle. We will enable them when we're done.
182
173
 
183
- This will trigger a support release job that should skip publishing. We do not need to wait for this
184
- job.
185
-
186
- 2. Update `master` to point to the next major release `prerelease/major` is currently pointing to.
187
- This step produces the actual release, including a Slack message.
174
+ Locally, make sure to fetch upstream.
188
175
 
189
176
  ```sh
190
- git checkout master
191
- git pull upstream master
192
- git pull upstream prerelease/major
193
- git push upstream master
177
+ git fetch upstream
194
178
  ```
195
179
 
196
- This will trigger the
197
- [release workflow](https://github.com/Workday/canvas-kit/actions/workflows/release.yml). Up to this
198
- point, `prerelease/major` has been creating canary jobs. This will trigger the actual release. We
199
- must wait for this job to finish. The job will be running against `master`. The CI job will run
200
- `lerna bump` and push that commit back onto the `master` branch which will include the update to
201
- `lerna.json` that we need in the next step.
180
+ 1. Update `support` to point to the current major version `master` is currently pointing to. This
181
+ effectively moves the `HEAD` pointer of the `support` branch to the same `HEAD` of `master`
202
182
 
203
- 3. Once the previous step is completed, we need to update `prerelease/minor` to point to the next
204
- major release. After this step, any PRs against this branch will be correct.
183
+ ```sh
184
+ git checkout master
185
+ git pull upstream master
186
+ git push upstream master:support
187
+ ```
205
188
 
206
- ```sh
207
- git checkout prerelease/minor
208
- git pull upstream prerelease/minor
209
- git pull upstream master
210
- git commit --allow-empty --no-verify -m "Bump prerelease/minor to new major version [skip release]"
211
- git push upstream prerelease/minor
212
- ```
189
+ Normally, this would trigger a release job, but we've disabled the job and there's nothing to
190
+ release anyway.
213
191
 
214
- 4. Now we need to update `prerelease/major` with the changes we made to `prerelease/minor` which
215
- include the major release version bump. This will point the canary build to the next next major
216
- version. For example, if `prerelease/major` was pointing to v6 before our release, it will now
217
- point to v7.
192
+ 1. Re-enable the [Release](https://github.com/Workday/canvas-kit/actions/workflows/release.yml) job
193
+ ([Enable Workflow Docs](https://docs.github.com/en/actions/managing-workflow-runs/disabling-and-enabling-a-workflow#enabling-a-workflow))
218
194
 
219
- ```sh
220
- git checkout prerelease/major
221
- git pull upstream prerelease/major
222
- git pull upstream prerelease/minor
223
- git push upstream prerelease/major
224
- ```
195
+ 1. Update `master` to point to the next major release `prerelease/major` is currently pointing to.
196
+ This step produces the actual release, including a Slack message.
197
+
198
+ ```sh
199
+ git checkout prerelease/major
200
+ git pull upstream prerelease/major
201
+ git push upstream prerelease/major:master
202
+ ```
203
+
204
+ This will trigger the
205
+ [release workflow](https://github.com/Workday/canvas-kit/actions/workflows/release.yml). Up to
206
+ this point, `prerelease/major` has been creating canary jobs. This will trigger the actual
207
+ release. We must wait for this job to finish. The job will be running against `master`. The CI
208
+ job will run `lerna bump` and push that commit back onto the `master` branch which will include
209
+ the update to `lerna.json` that we need in the next step.
210
+
211
+ **Note:** If something went wrong and a version is incorrect, you can cancel this release
212
+ workflow run and manually run it with a version override. For example, for the `v8.0.0` release,
213
+ a `lerna bump` command chose `v8.0.0` for a release version on a patch update and we had to
214
+ remove this release from npm. According to npm's release policy, they take down the release from
215
+ npm, but the version string can never be used again, so we the actual v8 release was `8.0.1`
216
+
217
+ 1. We need to wait for the release workflow job to finish and the slack message be announced. Once
218
+ the previous step is completed, we need to update `prerelease/minor` and `prerelease/major` to
219
+ point to the current `HEAD` of master (which should now contain the next major version release
220
+ commit).
221
+
222
+ ```sh
223
+ git checkout master
224
+ git pull upstream master
225
+ git push upstream master:prerelease/minor
226
+ git push upstream master:prerelease/major
227
+ ```
228
+
229
+ 1. Re-enable the [Canary](https://github.com/Workday/canvas-kit/actions/workflows/canary.yml) and
230
+ [forward-merge](https://github.com/Workday/canvas-kit/actions/workflows/forward-merge.yml)
231
+ workflows
232
+ ([Enable Workflow Docs](https://docs.github.com/en/actions/managing-workflow-runs/disabling-and-enabling-a-workflow#enabling-a-workflow))
233
+
234
+ 1. 🎉
225
235
 
226
236
  ### Canary Releases
227
237
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@workday/canvas-kit-docs",
3
- "version": "8.0.9",
3
+ "version": "8.1.1",
4
4
  "description": "Documentation components of Canvas Kit components",
5
5
  "author": "Workday, Inc. (https://www.workday.com)",
6
6
  "license": "Apache-2.0",
@@ -42,7 +42,7 @@
42
42
  ],
43
43
  "dependencies": {
44
44
  "@storybook/csf": "0.0.1",
45
- "@workday/canvas-kit-react": "^8.0.9"
45
+ "@workday/canvas-kit-react": "^8.1.1"
46
46
  },
47
47
  "devDependencies": {
48
48
  "fs-extra": "^10.0.0",
@@ -50,5 +50,5 @@
50
50
  "mkdirp": "^1.0.3",
51
51
  "typescript": "4.1"
52
52
  },
53
- "gitHead": "9d2020979e7f6c9c6e23905df8478d99506c2c6a"
53
+ "gitHead": "142045dfa3915080b3740ac1964e835e85308461"
54
54
  }