Skip to content

Commit

Permalink
ci: update master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
jnestorCisco committed Nov 4, 2024
1 parent 547eb59 commit b0fb34e
Show file tree
Hide file tree
Showing 79 changed files with 1,154 additions and 1,331 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ workflows:
filters:
branches:
only:
- master
- main
jobs:
- storybook_web_components

Expand All @@ -303,7 +303,7 @@ workflows:
filters:
branches:
only:
- master
- main
tags:
only: /^.force-deploy/

Expand All @@ -314,7 +314,7 @@ workflows:
filters:
branches:
only:
- master
- main
jobs:
- lint_test_release

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_icons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch
#pull_request:
# types: [ opened, reopened, edited ]
# branches: [ master ]
# branches: [ main ]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_to_github_pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build and Publish Storybook to GitHub Pages

on:
push:
branches: ["master"]
branches: ["main"]

permissions:
contents: read
Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ to read on GitHub as well as in various git tools.

Footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/) if any.

Samples: (even more [samples](https://github.com/angular/angular/commits/master))
Samples: (even more [samples](https://github.com/angular/angular/commits/main))

```
docs(changelog): update change log to beta.5
Expand Down Expand Up @@ -169,7 +169,7 @@ Before you submit your pull request consider the following guidelines:
* Make your changes in a new git branch:

```shell
git checkout -b my-fix-branch master
git checkout -b my-fix-branch main
```

* Create your patch, **including appropriate test cases**.
Expand All @@ -195,7 +195,7 @@ Before you submit your pull request consider the following guidelines:
git push <username> my-fix-branch
```

* In GitHub, send a pull request to `momentum-design/momentum-ui:master`.
* In GitHub, send a pull request to `momentum-design/momentum-ui:main`.
* If we suggest changes then:
* Make the required updates.
* Re-run the @momentum-ui test suite to ensure tests are still passing.
Expand All @@ -205,7 +205,7 @@ Before you submit your pull request consider the following guidelines:
* If the PR gets too outdated we may ask you to rebase and force push to update the PR:

```shell
git rebase master -i
git rebase main -i
git push <username> my-fix-branch -f
```

Expand All @@ -225,10 +225,10 @@ from the main (upstream) repository:
git push <username> --delete my-fix-branch
```
* Check out the master branch:
* Check out the main branch:
```shell
git checkout master -f
git checkout main -f
```
* Delete the local branch:
Expand All @@ -237,10 +237,10 @@ from the main (upstream) repository:
git branch -D my-fix-branch
```
* Update your master with the latest upstream version:
* Update your main with the latest upstream version:
```shell
git pull --ff upstream master
git pull --ff upstream main
```
## License
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# @momentum-ui

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-blue.svg)](https://conventionalcommits.org)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/LICENSE)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/LICENSE)
[![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io/)

## **DEPRECATION NOTICE**
Expand All @@ -27,9 +27,9 @@ Packages which are deprecated and will no longer receive updates

### Migration Guide

* Icons - https://github.com/momentum-design/momentum-ui/blob/master/icons-rebrand/MIGRATION.MD
* Illustrations - https://github.com/momentum-design/momentum-ui/blob/master/illustrations/MIGRATION.MD
* Animations - https://github.com/momentum-design/momentum-ui/blob/master/animations/MIGRATION.MD
* Icons - https://github.com/momentum-design/momentum-ui/blob/main/icons-rebrand/MIGRATION.MD
* Illustrations - https://github.com/momentum-design/momentum-ui/blob/main/illustrations/MIGRATION.MD
* Animations - https://github.com/momentum-design/momentum-ui/blob/main/animations/MIGRATION.MD
* Tokens - TODO


Expand Down
4 changes: 2 additions & 2 deletions charts/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Momentum UI Charts

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/angular/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/angular/LICENSE)

> @momentum-ui/charts
Expand Down
2 changes: 1 addition & 1 deletion charts/doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ or

### Github

You can clone Momentum Charts from [github](https://github.com/momentum-design/momentum-ui/tree/master/charts).
You can clone Momentum Charts from [github](https://github.com/momentum-design/momentum-ui/tree/main/charts).

After you download and go to charts folder, you can run ```yarn build``` to generate different files for usage.

Expand Down
6 changes: 3 additions & 3 deletions charts/doc/api/arc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Arc

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/arc
Expand Down Expand Up @@ -49,7 +49,7 @@ Besides generator and modify, the config here contains property ```pie```.

## generator

Generator defines how to create the shape with data. We use the D3 [arc](https://github.com/d3/d3/blob/master/API.md#arcs) generator here.
Generator defines how to create the shape with data. We use the D3 [arc](https://github.com/d3/d3/blob/main/API.md#arcs) generator here.

You can set the following prototoype according D3's settings.

Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/area.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Area

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/area
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/axis.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Axis

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/axis
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/board.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Board

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/board
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/break.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Break

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/break
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/colors.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Colors

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/colors
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/database.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Database

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/database
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/eventControl.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Event Control

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/utils/eventControls
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/layer.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Layer

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/utils/layer
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/legends.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# LEGENDS

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/legends
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/line.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Line

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/line
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/preload.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Preload

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/preload
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/rect.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Rect

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/rect
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/responsive.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# responsive

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/responsive
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/scale.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Scale

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/scale
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/shape.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Shape

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/shape
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/symbol.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Symbol

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/symbol
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/template
Expand Down
4 changes: 2 additions & 2 deletions charts/doc/api/text.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Text

[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/master.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/master/charts/LICENSE)
[![CircleCI](https://img.shields.io/circleci/project/github/momentum-design/momentum-ui/main.svg)](https://circleci.com/gh/momentum-design/momentum-ui/)
[![license](https://img.shields.io/github/license/momentum-design/momentum-ui.svg?color=blueviolet)](https://github.com/momentum-design/momentum-ui/blob/main/charts/LICENSE)

> @momentum-ui/charts/text
Expand Down
Loading

0 comments on commit b0fb34e

Please sign in to comment.