From 0ddc092c11960b5515b997586722155c1f272be8 Mon Sep 17 00:00:00 2001 From: Nico Rehwaldt Date: Thu, 14 Dec 2023 10:40:01 +0100 Subject: [PATCH] chore: make `main` the default branch --- .github/ISSUE_TEMPLATE/BUG_REPORT.md | 2 +- .github/workflows/CODE_SCANNING.yml | 4 ++-- .github/workflows/MERGE_MASTER_TO_DEVELOP.yml | 10 +++++----- README.md | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md index a114121a5..912f6bd8d 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -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 diff --git a/.github/workflows/CODE_SCANNING.yml b/.github/workflows/CODE_SCANNING.yml index cdcaed229..aaead39d2 100644 --- a/.github/workflows/CODE_SCANNING.yml +++ b/.github/workflows/CODE_SCANNING.yml @@ -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' diff --git a/.github/workflows/MERGE_MASTER_TO_DEVELOP.yml b/.github/workflows/MERGE_MASTER_TO_DEVELOP.yml index ca107a5e7..790ecd42b 100644 --- a/.github/workflows/MERGE_MASTER_TO_DEVELOP.yml +++ b/.github/workflows/MERGE_MASTER_TO_DEVELOP.yml @@ -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 @@ -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 diff --git a/README.md b/README.md index 4bced013b..6d5d16413 100644 --- a/README.md +++ b/README.md @@ -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)