diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ffac6947..23e3f73d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -7,10 +7,10 @@ name: "CodeQL" on: push: - branches: [master] + branches: [main] pull_request: # The branches below must be a subset of the branches above - branches: [master] + branches: [main] schedule: - cron: '0 0 * * 2' diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 2516f4a0..8a9ba631 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main name: Package @@ -13,7 +13,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 with: - ref: master + ref: main - name: Package run: | npm ci @@ -24,4 +24,4 @@ jobs: git config --global user.name "GitHub Actions" git add dist/ git commit -m "chore: Update dist" || echo "No changes to commit" - git push origin HEAD:master + git push origin HEAD:main diff --git a/.mergify.yml b/.mergify.yml index b9428c55..e23d66ce 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,7 +8,7 @@ queue_rules: pull_request_rules: - name: Automatically merge on CI success and review approval conditions: - - base~=master|integ-tests + - base~=main|integ-tests - "#approved-reviews-by>=1" - approved-reviews-by=@aws-actions/aws-ecr - -approved-reviews-by~=author @@ -26,7 +26,7 @@ pull_request_rules: - name: Automatically approve and merge Dependabot PRs conditions: - - base=master + - base=main - author=dependabot[bot] - status-success=Run Unit Tests - status-success=Semantic Pull Request