diff --git a/.circleci/config.yml b/.circleci/config.yml index 2bf42be92c2..59d0ab399c9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -117,7 +117,7 @@ workflows: filters: branches: ignore: - - master + - release - gh-pages - deploy-preview: filters: @@ -129,4 +129,4 @@ workflows: filters: branches: only: - - master + - release diff --git a/.drone.yml b/.drone.yml index 61cf302517e..4ba048cac12 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,7 @@ steps: - push branch: exclude: - - master + - release - develop - gh-pages - rc/* @@ -85,7 +85,7 @@ steps: - push branch: include: - - master + - release - name: slack image: plugins/slack diff --git a/.travis.yml b/.travis.yml index ccd74b41670..667f5f5f537 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,10 +39,10 @@ jobs: stages: - name: test - if: NOT (branch =~ /^(master|gh-pages)/) + if: NOT (branch =~ /^(release|gh-pages)/) - name: deploy-preview if: (branch =~ /^(develop|rc\/.*)/) - name: deploy-release - if: (branch = master) + if: (branch = release) diff --git a/README.md b/README.md index e74a02d2ea3..939467c015e 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,4 @@ Install [Node](https://nodejs.org) and [Yarn](https://yarnpkg.com). ## Releases -The CI will handle new releases once new changes gets merged into the `master` branch. Mainly though a Pull Request. +The CI will handle new releases once new changes gets merged into the `origin/release` branch. Mainly though a Pull Request. diff --git a/packages/dnb-design-system-portal/gatsby-config.js b/packages/dnb-design-system-portal/gatsby-config.js index 69a5020c2b0..e3362b8884a 100644 --- a/packages/dnb-design-system-portal/gatsby-config.js +++ b/packages/dnb-design-system-portal/gatsby-config.js @@ -12,7 +12,7 @@ module.exports = { 'The DNB Style Guide is the go to place for all who has to design, develop or create visuals with the DNB design.', // homepage: 'https://www.dnb.no', // siteUrl: 'https://www.dnb.no', - repoUrl: 'https://github.com/dnbexperience/eufemia/tree/master/' + repoUrl: 'https://github.com/dnbexperience/eufemia/tree/release/' }, plugins: [ { diff --git a/packages/dnb-design-system-portal/src/pages/uilib/development/deploy.md b/packages/dnb-design-system-portal/src/pages/uilib/development/deploy.md index ce29c7e3152..2e318321024 100644 --- a/packages/dnb-design-system-portal/src/pages/uilib/development/deploy.md +++ b/packages/dnb-design-system-portal/src/pages/uilib/development/deploy.md @@ -18,10 +18,10 @@ Once You push Your branch `ftr/your-feature` (or what ever) to remote **origin** Merges from a Pull Request and other pushes to the development branch `origin/develop`, will trigger a **test build** of the Portal. This way me make sure that a new Portal version can be build, before we actually publish a new build. -### The Master Branch +### The Release Branch -Make sure You only make Pull Request from `origin/develop` into `origin/master`. -The Master Branch is more kind of a **slave branch**. It reflects the latest version, but is actually only used to publish new versions and to make builds for the Portal. +Make sure You only make Pull Request from `origin/develop` into `origin/release`. +The Release Branch is more kind of a **slave branch**. It reflects the latest version, but is actually only used to publish new versions and to make builds for the Portal. **TODO:** GitFlow and CI structure graphics @@ -34,6 +34,6 @@ The steps, from code changes to production builds are: 1. Commit Your changes with the correct **[message decoration](/uilib/development/commit)** 1. Push or make a Pull Request to the `origin/develop` branch 1. Wait until the CI Server has validated the commits -1. Make a [Pull Request](https://github.com/dnbexperience/eufemia/compare/master...develop?expand=1) +1. Make a [Pull Request](https://github.com/dnbexperience/eufemia/compare/release...develop?expand=1) 1. Once the Pull Request will be approved by one of the authored [repo contributors](https://github.com/dnbexperience/eufemia/graphs/contributors), 1. The CI Server will deploy the Portal and NPM builds diff --git a/packages/dnb-design-system-portal/src/pages/uilib/development/ui-lib.md b/packages/dnb-design-system-portal/src/pages/uilib/development/ui-lib.md index 0f69086ae61..1ea144a70b8 100644 --- a/packages/dnb-design-system-portal/src/pages/uilib/development/ui-lib.md +++ b/packages/dnb-design-system-portal/src/pages/uilib/development/ui-lib.md @@ -24,6 +24,6 @@ These folders/files will be a part of the npm [package](https://unpkg.com/dnb-ui Make sure You use a correct **[message decoration](/uilib/development/commit)** to insure correct versioning. -You have to commit (or Pull Request merge) your changes to the `origin/develop` branch. Once Your commits gets approved by the CI Server, You can make a _Pull Request_ to the `origin/master`. +You have to commit (or Pull Request merge) your changes to the `origin/develop` branch. Once Your commits gets approved by the CI Server, You can make a _Pull Request_ to the `origin/release`. -As soon as the _Pull Request_ gets merged into `origin/master`, the CI Server will check all commits and figure out the new NPM **Version Number** and publish a new version based on the message decorations. +As soon as the _Pull Request_ gets merged into `origin/release`, the CI Server will check all commits and figure out the new NPM **Version Number** and publish a new version based on the message decorations. diff --git a/packages/dnb-ui-lib/.releaserc b/packages/dnb-ui-lib/.releaserc index 28da608571b..9f5ae0a7b05 100644 --- a/packages/dnb-ui-lib/.releaserc +++ b/packages/dnb-ui-lib/.releaserc @@ -2,6 +2,6 @@ "ci": true, "debug": false, "dryRun": false, - "branch": "master", + "branch": "release", "analyzeCommits": "simple-commit-message" } diff --git a/packages/dnb-ui-lib/src/components/input-masked/details.md b/packages/dnb-ui-lib/src/components/input-masked/details.md index 76e0a8a1e7d..1e8fb31627e 100644 --- a/packages/dnb-ui-lib/src/components/input-masked/details.md +++ b/packages/dnb-ui-lib/src/components/input-masked/details.md @@ -1,4 +1,4 @@ -| Properties | Description | -| ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `mask` | _(mandatory)_ The mask prop, defined with a RegExp style of of characters or a callback function. Se [example](https://github.com/dnbexperience/eufemia/tree/master/packages/dnb-ui-lib/src/components/input-masked/Example.js). | -| `show_mask` | _(optional)_ Show mask when input is empty and has no focus. | +| Properties | Description | +| ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `mask` | _(mandatory)_ The mask prop, defined with a RegExp style of of characters or a callback function. Se [example](https://github.com/dnbexperience/eufemia/tree/develop/packages/dnb-ui-lib/src/components/input-masked/Example.js). | +| `show_mask` | _(optional)_ Show mask when input is empty and has no focus. |