From 3a061254c9fce7c48ec004853cf1cff61b6fcfc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ramon=20R=C3=BCttimann?= Date: Tue, 10 Jan 2023 13:05:57 +0100 Subject: [PATCH] chore: update master to main --- .circleci/config.yml | 20 ++++++++++---------- .github/workflows/release-notes.yaml | 4 ++-- package.json | 5 +++++ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d6e397..3ba1630 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -104,7 +104,7 @@ jobs: workflows: version: 2 - PR_TO_MASTER: + PR_TO_MAIN: jobs: - install_dev_deps: name: Install with devDependencies @@ -112,7 +112,7 @@ workflows: filters: branches: ignore: - - master + - main - lint: name: Lint context: nodejs-install @@ -121,7 +121,7 @@ workflows: filters: branches: ignore: - - master + - main - test: name: Test context: nodejs-install @@ -130,7 +130,7 @@ workflows: filters: branches: ignore: - - master + - main - install_prod_deps: name: Install PROD deps context: nodejs-install @@ -140,9 +140,9 @@ workflows: filters: branches: ignore: - - master + - main - MERGE_TO_MASTER: + MERGE_TO_MAIN: jobs: - install_dev_deps: name: Install with devDependencies @@ -152,7 +152,7 @@ workflows: filters: branches: only: - - master + - main post-steps: - *slack-fail-notify - lint: @@ -165,7 +165,7 @@ workflows: filters: branches: only: - - master + - main post-steps: - *slack-fail-notify - test: @@ -178,7 +178,7 @@ workflows: filters: branches: only: - - master + - main post-steps: - *slack-fail-notify - release: @@ -193,7 +193,7 @@ workflows: filters: branches: only: - - master + - main post-steps: - *slack-fail-notify - *slack-success-notify diff --git a/.github/workflows/release-notes.yaml b/.github/workflows/release-notes.yaml index cd30964..6bd7f5f 100644 --- a/.github/workflows/release-notes.yaml +++ b/.github/workflows/release-notes.yaml @@ -2,7 +2,7 @@ name: Release-Notes-Preview on: pull_request: - branches: [ master ] + branches: [ main ] jobs: preview: @@ -14,7 +14,7 @@ jobs: git fetch --prune --unshallow --tags - uses: snyk/release-notes-preview@v1.4.0 with: - releaseBranch: master + releaseBranch: main env: GITHUB_PR_USERNAME: ${{ github.actor }} GITHUB_TOKEN: ${{ secrets.RELEASE_NOTES_GITHUB_TOKEN }} diff --git a/package.json b/package.json index 04938e9..6e4d5c5 100644 --- a/package.json +++ b/package.json @@ -40,5 +40,10 @@ "ts-node": "7.0.0", "tsc-watch": "4.2.3", "typescript": "3.8.3" + }, + "release": { + "branches": [ + "main" + ] } }