Skip to content

Commit

Permalink
chore: Merge prerelease/minor into prerelease/major
Browse files Browse the repository at this point in the history
  • Loading branch information
NicholasBoll committed May 10, 2023
2 parents 87587db + 5e3f211 commit 819869b
Show file tree
Hide file tree
Showing 37 changed files with 297 additions and 99 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/dist-tag.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: 'Dist Tag Update'
## Action to update an existing npm dist-tag by the entered package version
## or to create a new dist-tag if you enter not-existing name

on:
workflow_dispatch:
inputs:
dist-tag:
required: true
description: Dist tag name
version:
required: true
description: Package version number

jobs:
release-major:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x

- name: Check packages
run: node utils/dist-tag.mjs
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_CI_PUBLISH_TOKEN }}
DIST_TAG: ${{ inputs.dist-tag }}
VERSION: ${{ inputs.version }}
69 changes: 69 additions & 0 deletions .github/workflows/release-major.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: Major Release

on:
workflow_dispatch:

jobs:
release-major:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
persist-credentials: false
fetch-depth: 0 # Needed to do a proper push

# Update support to point to the current major version
- name: Push changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GH_RW_TOKEN }}
branch: support

# Get and save the current major version tag
# before the next major version is released
# to use it for updating dist-tag on support branch.
- name: Get previous tag
id: previous-tag
run: echo "::set-output name=tag::$(node -p 'require("./lerna.json").version')"

# Pull changes from prerelease/major into master.
# Changes will be pushed with a release commit
- name: Pull changes >> prerelease/major -> master
run: git pull origin prerelease/major

- uses: Workday/canvas-kit-actions/install@v1
with:
node_version: 16.x

# Run the release job to publish the next major version to npm
- uses: Workday/canvas-kit-actions/release@v1
with:
gh_token: ${{ secrets.GITHUB_TOKEN }}
gh_rw_token: ${{ secrets.GH_RW_TOKEN }}
publish_token: ${{ secrets.NPM_CI_PUBLISH_TOKEN }}
chromatic_project_token: ${{ secrets.CHROMATIC_APP_CODE }}
version: 'major'
toRef: 'prerelease/major'

# Update prerelease/minor to point to the next major release.
- name: Push changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GH_RW_TOKEN }}
branch: prerelease/minor

# Update prerelease/major with the changes from prerelease/minor which include the major release version bump.
- name: Push changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GH_RW_TOKEN }}
branch: prerelease/major

# Update npm dist tag for support by adding a current major release version
- name: Update support dist tag
run: node utils/dist-tag.mjs
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_CI_PUBLISH_TOKEN }}
DIST_TAG: 'support'
VERSION: ${{ steps.previous-tag.outputs.tag }}
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [v8.6.5](https://github.com/Workday/canvas-kit/releases/tag/v8.6.5) (2023-05-10)

### Infrastructure

- chore: Add actions for major release ([#2211](https://github.com/Workday/canvas-kit/pull/2211)) ([@RayRedGoose](https://github.com/RayRedGoose), [@mannycarrera4](https://github.com/mannycarrera4))


## [v8.6.4](https://github.com/Workday/canvas-kit/releases/tag/v8.6.4) (2023-05-01)

### BREAKING CHANGES

- [#2173](https://github.com/Workday/canvas-kit/pull/2173) Optional breaking changes message. If your PR includes breaking changes. It is extremely rare to put breaking changes outside a `prerelease/major` branch. Anything in this section will show up in release notes. Remove this section if no breaking changes are present.

### Documentation

- fix: Basic Grid Example with landmark regions for screen readers ([#2173](https://github.com/Workday/canvas-kit/pull/2173)) ([@bstanton678](https://github.com/bstanton678))
Optional release note message. Changelog and release summaries will contain a pull request title. This section will add additional notes under that title. This section is not a summary, but something extra to point out in release notes. An example might be calling out breaking changes in a labs component or minor visual changes that need visual regression updates. Remove this section if no additional release notes are required.


## [v8.6.3](https://github.com/Workday/canvas-kit/releases/tag/v8.6.3) (2023-05-01)

### Dependencies
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"modules/**"
],
"version": "8.6.3",
"version": "8.6.5",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
2 changes: 1 addition & 1 deletion modules/codemod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@workday/canvas-kit-codemod",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
"version": "8.6.3",
"version": "8.6.5",
"description": "A collection of codemods for use on Workday Canvas Kit packages.",
"main": "dist/es6/index.js",
"sideEffects": false,
Expand Down
2 changes: 1 addition & 1 deletion modules/css-fonts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-fonts",
"version": "8.6.3",
"version": "8.6.5",
"description": "Fonts for canvas-kit-css",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
6 changes: 3 additions & 3 deletions modules/css/action-bar/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-action-bar",
"version": "8.6.3",
"version": "8.6.5",
"description": "Action bar CSS for canvas-kit-css",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -16,8 +16,8 @@
"url": "http://github.com/Workday/canvas-kit/tree/master/modules/action-bar/css"
},
"dependencies": {
"@workday/canvas-kit-css-button": "^8.6.3",
"@workday/canvas-kit-css-core": "^8.6.3"
"@workday/canvas-kit-css-button": "^8.6.5",
"@workday/canvas-kit-css-core": "^8.6.5"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
Expand Down
2 changes: 1 addition & 1 deletion modules/css/badge/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-badge",
"version": "8.6.3",
"version": "8.6.5",
"description": "provides a summary indicator with dynamic values",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions modules/css/banner/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-banner",
"version": "8.6.3",
"version": "8.6.5",
"description": "Errors and alerts for canvas-kit-css",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -16,7 +16,7 @@
"url": "http://github.com/Workday/canvas-kit/tree/master/modules/banner/css"
},
"dependencies": {
"@workday/canvas-kit-css-core": "^8.6.3",
"@workday/canvas-kit-css-core": "^8.6.5",
"@workday/canvas-system-icons-web": "^3.0.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions modules/css/button/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-button",
"version": "8.6.3",
"version": "8.6.5",
"description": "The button css for canvas-kit-css",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -16,7 +16,7 @@
"url": "http://github.com/Workday/canvas-kit/tree/master/modules/button/css"
},
"dependencies": {
"@workday/canvas-kit-css-core": "^8.6.3",
"@workday/canvas-kit-css-core": "^8.6.5",
"@workday/canvas-system-icons-web": "^3.0.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions modules/css/card/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-card",
"version": "8.6.3",
"version": "8.6.5",
"description": "Card CSS for canvas-kit-css",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -16,7 +16,7 @@
"url": "http://github.com/Workday/canvas-kit/tree/master/modules/card/css"
},
"dependencies": {
"@workday/canvas-kit-css-core": "^8.6.3"
"@workday/canvas-kit-css-core": "^8.6.5"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
Expand Down
6 changes: 3 additions & 3 deletions modules/css/checkbox/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-checkbox",
"version": "8.6.3",
"version": "8.6.5",
"description": "The checkbox css for canvas-kit-css",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -29,7 +29,7 @@
"workday"
],
"dependencies": {
"@workday/canvas-kit-css-common": "^8.6.3",
"@workday/canvas-kit-css-core": "^8.6.3"
"@workday/canvas-kit-css-common": "^8.6.5",
"@workday/canvas-kit-css-core": "^8.6.5"
}
}
4 changes: 2 additions & 2 deletions modules/css/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-common",
"version": "8.6.3",
"version": "8.6.5",
"description": "The common css for canvas-kit-css",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -28,6 +28,6 @@
"workday"
],
"dependencies": {
"@workday/canvas-kit-css-core": "^8.6.3"
"@workday/canvas-kit-css-core": "^8.6.5"
}
}
2 changes: 1 addition & 1 deletion modules/css/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-core",
"version": "8.6.3",
"version": "8.6.5",
"description": "The core css for canvas-kit-css",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
16 changes: 8 additions & 8 deletions modules/css/form-field/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-form-field",
"version": "8.6.3",
"version": "8.6.5",
"description": "The form css for canvas-kit-css",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -16,16 +16,16 @@
"url": "http://github.com/Workday/canvas-kit/tree/master/modules/form-field/css"
},
"dependencies": {
"@workday/canvas-kit-css-common": "^8.6.3",
"@workday/canvas-kit-css-core": "^8.6.3",
"@workday/canvas-kit-css-common": "^8.6.5",
"@workday/canvas-kit-css-core": "^8.6.5",
"@workday/canvas-system-icons-web": "^3.0.0"
},
"devDependencies": {
"@workday/canvas-kit-css-checkbox": "^8.6.3",
"@workday/canvas-kit-css-radio": "^8.6.3",
"@workday/canvas-kit-css-select": "^8.6.3",
"@workday/canvas-kit-css-text-area": "^8.6.3",
"@workday/canvas-kit-css-text-input": "^8.6.3"
"@workday/canvas-kit-css-checkbox": "^8.6.5",
"@workday/canvas-kit-css-radio": "^8.6.5",
"@workday/canvas-kit-css-select": "^8.6.5",
"@workday/canvas-kit-css-text-area": "^8.6.5",
"@workday/canvas-kit-css-text-input": "^8.6.5"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
Expand Down
4 changes: 2 additions & 2 deletions modules/css/icon/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-icon",
"version": "8.6.3",
"version": "8.6.5",
"description": "Icon toolkit for Canvas kit",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -17,7 +17,7 @@
},
"dependencies": {
"@workday/canvas-colors-web": "^2.0.0",
"@workday/canvas-kit-css-core": "^8.6.3",
"@workday/canvas-kit-css-core": "^8.6.5",
"svg-injector": "^1.1.3",
"to-slug-case": "^1.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions modules/css/layout/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-layout",
"version": "8.6.3",
"version": "8.6.5",
"description": "Layout css for canvas-kit-css",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -16,7 +16,7 @@
"url": "http://github.com/Workday/canvas-kit/tree/master/modules/layout/css"
},
"dependencies": {
"@workday/canvas-kit-css-core": "^8.6.3"
"@workday/canvas-kit-css-core": "^8.6.5"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
Expand Down
4 changes: 2 additions & 2 deletions modules/css/loading-dots/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-loading-dots",
"version": "8.6.3",
"version": "8.6.5",
"description": "Animations used while a page or component is loading.",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -17,7 +17,7 @@
"directory": "modules/css/loading-dots"
},
"dependencies": {
"@workday/canvas-kit-css-core": "^8.6.3"
"@workday/canvas-kit-css-core": "^8.6.5"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
Expand Down
4 changes: 2 additions & 2 deletions modules/css/menu/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-menu",
"version": "8.6.3",
"version": "8.6.5",
"description": "Menu CSS for Canvas kit CSS",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -16,7 +16,7 @@
"url": "http://github.com/Workday/canvas-kit/tree/master/modules/menu/css"
},
"dependencies": {
"@workday/canvas-kit-css-core": "^8.6.3"
"@workday/canvas-kit-css-core": "^8.6.5"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
Expand Down
6 changes: 3 additions & 3 deletions modules/css/modal/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css-modal",
"version": "8.6.3",
"version": "8.6.5",
"description": "Modal CSS for Canvas kit CSS",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand All @@ -16,8 +16,8 @@
"url": "http://github.com/Workday/canvas-kit/tree/master/modules/modal/css"
},
"dependencies": {
"@workday/canvas-kit-css-core": "^8.6.3",
"@workday/canvas-kit-css-popup": "^8.6.3"
"@workday/canvas-kit-css-core": "^8.6.5",
"@workday/canvas-kit-css-popup": "^8.6.5"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
Expand Down
Loading

0 comments on commit 819869b

Please sign in to comment.