Skip to content

Commit 8c1e3bb

Browse files
committed
ci(*): updating contribution md and yml for new branch name
1 parent 709334c commit 8c1e3bb

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,23 @@ Open both repositories ([DocFX Site Builder](https://github.com/IgniteUI/igniteu
4848
# <a name='#fixing'> Fixing bugs and adding new samples</a>
4949
## <a name='#bug'> Bug fixing guidelines</a>
5050

51-
1. Depending on where the bug was found `the current version` or the `ongoing release version`, checkout a development branches from `vNext` or/and `master` branch. `vNext` is the version that is going to be used upon release (next version), and `master` is the branch with the current state (current version available on production). If the change/fix is applicable only to the ongoing release branch (`vNext`) there is no need to cherry-pick to `master` branch as the change/fix/feature will be pushed to `master` branch upon release.
51+
1. Depending on where the bug was found `the current version` or the `ongoing release version`, checkout a development branches from `vnext` or/and `master` branch. `vnext` is the version that is going to be used upon release (next version), and `master` is the branch with the current state (current version available on production). If the change/fix is applicable only to the ongoing release branch (`vnext`) there is no need to cherry-pick to `master` branch as the change/fix/feature will be pushed to `master` branch upon release.
5252
2. Run lint
5353
3. Pull request your changes and reference the issue. Use the enforced commit message format with applicable type, scope, etc.
5454
4. Don't forget to make the necessary status updates, as described in the workflow section.
5555

56-
> Note: Cherry-pick to `master` branch only changes with **high priority**. There is no need to cherry-pick into `master` every bug fix/change from `vNext`> A regular mass merge PRs are going to be made from `vNext` into `master`.
56+
> Note: Cherry-pick to `master` branch only changes with **high priority**. There is no need to cherry-pick into `master` every bug fix/change from `vnext`> A regular mass merge PRs are going to be made from `vnext` into `master`.
5757
5858
**Example workflow for a bug with high priority**
5959
The process will look like this:
6060

61-
1. Checkout new branch from `vNext`. For code example purposes let's say the new branch is called `fixing-bug-5423-vNext`.
62-
2. Commit your changes to your `fixing-bug-5423-vNext` branch.
63-
3. Push and PR to the `vNext` branch.
61+
1. Checkout new branch from `vnext`. For code example purposes let's say the new branch is called `fixing-bug-5423-vnext`.
62+
2. Commit your changes to your `fixing-bug-5423-vnext` branch.
63+
3. Push and PR to the `vnext` branch.
6464
4. Switch to the `master` branch.
6565
5. Create a new branch from `master`. For code example purposes let's say the new branch is called `fixing-bug-5423-master`.
66-
6. Cherry pick your commit from the `fixing-bug-5423-vNext` branch: `git cherry-pick ..`
66+
6. Cherry pick your commit from the `fixing-bug-5423-vnext` branch: `git cherry-pick ..`
6767
7. Push to your `fixing-bug-5423-master` branch and PR to the `master` branch.
6868

6969
## <a name='#new-sample'> Adding new samples guidelines </a>
70-
Depending on where the the new sample should be added, `the current version` or the `ongoing release version`, checkout a development branches from `vNext` or/and `master` branch. `vNext` is the version that is going to be used upon release (next version), and `master` is the branch with the current state (current version). If the new sample is applicable only to the ongoing release branch (`vNext`) there is no need to cherry-pick to `master` branch as the new sample will be pushed to `master` branch upon release.
70+
Depending on where the the new sample should be added, `the current version` or the `ongoing release version`, checkout a development branches from `vnext` or/and `master` branch. `vnext` is the version that is going to be used upon release (next version), and `master` is the branch with the current state (current version). If the new sample is applicable only to the ongoing release branch (`vnext`) there is no need to cherry-pick to `master` branch as the new sample will be pushed to `master` branch upon release.

.github/workflows/build-app-crm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ name: App CRM CI
66
# events but only for the master branch
77
on:
88
push:
9-
branches: [ master, vNext ]
9+
branches: [ master, vnext ]
1010
paths:
1111
- '**'
1212
- '!src/**'
1313
- '!live-editing/**'
1414
- '!projects/app-lob/**'
1515
pull_request:
16-
branches: [ master, vNext ]
16+
branches: [ master, vnext ]
1717
paths:
1818
- '**'
1919
- '!src/**'

.github/workflows/build-app-lob.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: App LOB CI
66
# events but only for the master branch
77
on:
88
push:
9-
branches: [ master, vNext ]
9+
branches: [ master, vnext ]
1010
paths:
1111
- '**'
1212
- '!src/**'
@@ -16,7 +16,7 @@ on:
1616
- 'live-editing/generators/AppDVConfigGenerators.ts'
1717
- '!projects/app-crm/**'
1818
pull_request:
19-
branches: [ master, vNext ]
19+
branches: [ master, vnext ]
2020
paths:
2121
- '**'
2222
- '!src/**'

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ "master", "vNext" ]
16+
branches: [ "master", "vnext" ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ "master", "vNext" ]
19+
branches: [ "master", "vnext" ]
2020
schedule:
2121
- cron: '37 17 * * 1'
2222

0 commit comments

Comments
 (0)