Skip to content

Commit

Permalink
use "release" branch, instead of "master"
Browse files Browse the repository at this point in the history
  • Loading branch information
tujoworker committed Jan 22, 2019
1 parent 291d856 commit 9e0e41b
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ workflows:
filters:
branches:
ignore:
- master
- release
- gh-pages
- deploy-preview:
filters:
Expand All @@ -129,4 +129,4 @@ workflows:
filters:
branches:
only:
- master
- release
4 changes: 2 additions & 2 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ steps:
- push
branch:
exclude:
- master
- release
- develop
- gh-pages
- rc/*
Expand Down Expand Up @@ -85,7 +85,7 @@ steps:
- push
branch:
include:
- master
- release

- name: slack
image: plugins/slack
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion packages/dnb-design-system-portal/gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion packages/dnb-ui-lib/.releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"ci": true,
"debug": false,
"dryRun": false,
"branch": "master",
"branch": "release",
"analyzeCommits": "simple-commit-message"
}
8 changes: 4 additions & 4 deletions packages/dnb-ui-lib/src/components/input-masked/details.md
Original file line number Diff line number Diff line change
@@ -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. |

0 comments on commit 9e0e41b

Please sign in to comment.