diff --git a/.github/actions/action-00-toolbox/action.yml b/.github/actions/action-00-toolbox/action.yml index f5ed64655..b2bcc9e89 100644 --- a/.github/actions/action-00-toolbox/action.yml +++ b/.github/actions/action-00-toolbox/action.yml @@ -13,6 +13,6 @@ runs: using: "composite" steps: - name: Toolbox - Install CICD-Tools Toolbox - uses: cicd-tools-org/cicd-tools/.github/actions/action-00-toolbox@master + uses: cicd-tools-org/cicd-tools/.github/actions/action-00-toolbox@main with: PROJECT_ROOT_PATH: ${{ inputs.PROJECT_ROOT_PATH }} diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 84e67c97d..2f873484f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,7 +2,7 @@ version: 2 updates: - package-ecosystem: "npm" - target-branch: "master" + target-branch: "main" directory: "/" schedule: interval: "weekly" diff --git a/.github/scripts/step-setup-environment.sh b/.github/scripts/step-setup-environment.sh index 6079d072f..8c2ac2124 100644 --- a/.github/scripts/step-setup-environment.sh +++ b/.github/scripts/step-setup-environment.sh @@ -10,7 +10,7 @@ # NOTIFICATION_LINK: Consumed by the notification script to provide a clickable link to the workflow run in GitHub. # PROJECT_NAME: The slugified name of the template project. Should match the GitHub repository name. # PROJECT_OWNER: The GitHub owner of the project. -# TEMPLATE_BRANCH_NAME_BASE: The name of the templated repository's default branch name. (Defaults to 'master'.) +# TEMPLATE_BRANCH_NAME_BASE: The name of the templated repository's default branch name. (Defaults to 'main'.) # TEMPLATE_BRANCH_NAME_DEVELOPMENT: The name of the templated repository's development branch name. (Defaults to 'dev'.) # CI only script. @@ -35,7 +35,7 @@ main() { echo "NOTIFICATION_LINK=${PROJECT_NAME}${WORKFLOW_NAME} [<${WORKFLOW_URL}|${BRANCH_OR_TAG}>]" echo "PROJECT_NAME=${PROJECT_NAME}" echo "PROJECT_OWNER=${PROJECT_OWNER}" - echo "TEMPLATE_BRANCH_NAME_BASE=${TEMPLATE_BRANCH_NAME_BASE-master}" + echo "TEMPLATE_BRANCH_NAME_BASE=${TEMPLATE_BRANCH_NAME_BASE-main}" echo "TEMPLATE_BRANCH_NAME_DEVELOPMENT=${TEMPLATE_BRANCH_NAME_DEVELOPMENT-dev}" } >> "${GITHUB_ENV}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c61e0474f..d70d0e23d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ on: jobs: configuration: - uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-generic-read_json_file.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-generic-read_json_file.yml@main with: JSON_FILE_PATH: ".github/config/workflows/workflow-push.json" @@ -59,7 +59,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-30-generic-markdown_links.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-30-generic-markdown_links.yml@main with: CONFIG_FILE: ".github/config/actions/gaurav-nelson-github-action-markdown-link-check.json" DOCUMENTATION_PATH: "." @@ -71,7 +71,7 @@ jobs: FILE_CONTENT: ${{ secrets.CI_ENVIRONMENT_CONTENT }} SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} ENV_SECRET_1: ${{ secrets.INTEGRATION_TEST_LAST_FM_KEY }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main with: ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress" COMMAND: coverage @@ -85,7 +85,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-rev_range_command.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-rev_range_command.yml@main with: COMMAND: | poetry run cz check --rev-range "${PUSHED_COMMIT_REV_RANGE}" @@ -99,7 +99,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-rev_range_command.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-rev_range_command.yml@main with: COMMAND: | CICD_COMMIT_MESSAGES_FILE="$(mktemp XXXXXXXX.git_history_file)" @@ -115,7 +115,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main with: ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress" COMMAND: build:validators @@ -125,12 +125,12 @@ jobs: VERBOSE_NOTIFICATIONS: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_verbose_notifications }} deploy_stage: - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' needs: [configuration, success_notification] secrets: FLYIO_API_TOKEN: ${{ secrets.FLYIO_API_TOKEN }} SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-95-container-flyio_deploy.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-95-container-flyio_deploy.yml@main with: FLYIO_ENDPOINT_URL: "https://stage-mla.fly.dev" VERBOSE_NOTIFICATIONS: true @@ -143,7 +143,7 @@ jobs: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} ENV_SECRET_1: ${{ secrets.VERCEL_TOKEN }} ENV_SECRET_2: ${{ secrets.PRODUCTION_VERCEL_CONFIG }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main with: ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress" COMMAND: ci:vercel; vercel pull --yes --environment=production --token="${ENV_SECRET_1}" @@ -170,7 +170,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main with: ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress" COMMAND: lint @@ -182,7 +182,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-10-generic-security_scan_credentials.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-10-generic-security_scan_credentials.yml@main with: EXTRA_BINARY_ARGS: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_trufflehog_extra_scan_args }} VERBOSE_NOTIFICATIONS: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_verbose_notifications }} @@ -191,7 +191,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main with: ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress" COMMAND: security @@ -212,7 +212,7 @@ jobs: - id: "lint-shell" name: "Shell Linting" max-parallel: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }} PRECOMMIT_HOOK_ID: ${{ matrix.hook.id }} @@ -225,7 +225,7 @@ jobs: secrets: FILE_CONTENT: ${{ secrets.CI_ENVIRONMENT_CONTENT }} SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main with: ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress" COMMAND: smoke:ci @@ -239,13 +239,13 @@ jobs: VERBOSE_NOTIFICATIONS: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_verbose_notifications }} smoke_tests_stage: - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' needs: [configuration, deploy_stage] secrets: ENV_SECRET_1: "https://stage-mla.fly.dev" FILE_CONTENT: ${{ secrets.STAGE_ENVIRONMENT_CONTENT }} SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main with: ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress" COMMAND: smoke:ci @@ -262,7 +262,7 @@ jobs: secrets: FILE_CONTENT: ${{ secrets.PRODUCTION_ENVIRONMENT_CONTENT }} SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main with: ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress" COMMAND: smoke:ci @@ -274,7 +274,7 @@ jobs: start_notification: secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-generic-notification.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-generic-notification.yml@main with: NOTIFICATION_EMOJI: ":vertical_traffic_light:" NOTIFICATION_MESSAGE: "Workflow has started!" @@ -301,7 +301,7 @@ jobs: ] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-generic-notification.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-generic-notification.yml@main with: NOTIFICATION_EMOJI: ":checkered_flag:" NOTIFICATION_MESSAGE: "All checks have completed successfully!" @@ -310,7 +310,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }} PRECOMMIT_HOOK_ID: "format-toml" @@ -322,7 +322,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main with: ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress" COMMAND: compile @@ -334,7 +334,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }} PRECOMMIT_HOOK_ID: "lint-github-workflow" diff --git a/README.md b/README.md index 2431d8970..f49ff3306 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ ### Stage -[![MLA CI/CD](https://github.com/Music-Metadata-Analysis/mla/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/Music-Metadata-Analysis/mla/actions/workflows/ci.yml) +[![MLA CI/CD](https://github.com/Music-Metadata-Analysis/mla/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/Music-Metadata-Analysis/mla/actions/workflows/ci.yml)