Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: make main the default branch #839

Merged
merged 1 commit into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BUG_REPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Steps to reproduce the behavior:
1. do this
2. do that

If possible, try to build [a test case](https://github.com/bpmn-io/diagram-js/tree/master/test/spec) that reproduces your problem.
If possible, try to build [a test case](https://github.com/bpmn-io/diagram-js/tree/main/test/spec) that reproduces your problem.


### Expected Behavior
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/CODE_SCANNING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "Code Scanning"

on:
push:
branches: [ master, develop ]
branches: [ main, develop ]
pull_request:
branches: [ master, develop ]
branches: [ main, develop ]
paths-ignore:
- '**/*.md'

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/MERGE_MASTER_TO_DEVELOP.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: MERGE_MASTER_TO_DEVELOP
name: MERGE_MAIN_TO_DEVELOP
on:
push:
branches:
- "master"
- "main"

jobs:
Merge_master_to_develop:
Merge_main_to_develop:
runs-on: ubuntu-latest
permissions:
contents: write
Expand All @@ -16,11 +16,11 @@ jobs:
with:
ref: develop
fetch-depth: 0
- name: Merge master to develop and push
- name: Merge main to develop and push
run: |
git config user.name '${{ secrets.BPMN_IO_USERNAME }}'
git config user.email '${{ secrets.BPMN_IO_EMAIL }}'
git merge -m 'Merge master to develop' --no-edit origin/master
git merge -m 'Merge main to develop' --no-edit origin/main
git push

- name: Notify failure on Slack
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Some libraries / applications built on top of diagram-js:

* [Issues](https://github.com/bpmn-io/diagram-js/issues)
* [Changelog](./CHANGELOG.md)
* [Contributing Guide](https://github.com/bpmn-io/diagram-js/blob/master/.github/CONTRIBUTING.md)
* [Contributing Guide](.github/CONTRIBUTING.md)
* [Examples](https://github.com/bpmn-io/diagram-js-examples)


Expand Down