diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 50caf773..54c324a0 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -4,6 +4,7 @@ on: pull_request: push: branches: + - main - master # Cancels all previous workflow runs for the same branch that have not yet completed. @@ -40,7 +41,7 @@ jobs: if: steps.check_composer_file.outputs.files_exists == 'true' uses: "ramsey/composer-install@v2" env: - COMPOSER_ROOT_VERSION: 'dev-master' + COMPOSER_ROOT_VERSION: 'dev-main' - name: Check existence of vendor/bin/parallel-lint file id: check_linter_file @@ -79,7 +80,7 @@ jobs: if: steps.check_files.outputs.files_exists == 'true' uses: "ramsey/composer-install@v2" env: - COMPOSER_ROOT_VERSION: 'dev-master' + COMPOSER_ROOT_VERSION: 'dev-main' - name: Check existence of vendor/bin/phpcs file id: check_phpcs_binary_file diff --git a/.github/workflows/regenerate-readme.yml b/.github/workflows/regenerate-readme.yml index cb5eec26..9469b049 100644 --- a/.github/workflows/regenerate-readme.yml +++ b/.github/workflows/regenerate-readme.yml @@ -4,6 +4,7 @@ on: workflow_dispatch: push: branches: + - main - master paths-ignore: - 'features/**' @@ -43,7 +44,7 @@ jobs: if: steps.check_composer_file.outputs.files_exists == 'true' uses: "ramsey/composer-install@v2" env: - COMPOSER_ROOT_VERSION: 'dev-master' + COMPOSER_ROOT_VERSION: 'dev-main' - name: Configure git user run: | @@ -95,7 +96,7 @@ jobs: uses: repo-sync/pull-request@v2 with: source_branch: regenerate-readme - destination_branch: master + destination_branch: main github_token: ${{ secrets.GITHUB_TOKEN }} pr_title: Regenerate README file pr_body: "**This is an automated pull-request**\n\nRefreshes the `README.md` file with the latest changes to the docblocks in the source code." diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 33f642dc..167af0ff 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -4,6 +4,7 @@ on: pull_request: push: branches: + - main - master # Cancels all previous workflow runs for the same branch that have not yet completed. @@ -46,7 +47,7 @@ jobs: if: steps.check_files.outputs.files_exists == 'true' uses: "ramsey/composer-install@v2" env: - COMPOSER_ROOT_VERSION: 'dev-master' + COMPOSER_ROOT_VERSION: 'dev-main' - name: Setup problem matcher to provide annotations for PHPUnit if: steps.check_files.outputs.files_exists == 'true' @@ -134,7 +135,7 @@ jobs: if: steps.check_files.outputs.files_exists == 'true' uses: "ramsey/composer-install@v2" env: - COMPOSER_ROOT_VERSION: 'dev-master' + COMPOSER_ROOT_VERSION: 'dev-main' - name: Start MySQL server if: steps.check_files.outputs.files_exists == 'true'