Skip to content

Commit

Permalink
ci(GITHUB): move project from master -> main
Browse files Browse the repository at this point in the history
  • Loading branch information
niall-byrne committed Mar 15, 2024
1 parent 3206a1b commit 0c1e472
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/actions/action-00-toolbox/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: 2
updates:
- package-ecosystem: "npm"
target-branch: "master"
target-branch: "main"
directory: "/"
schedule:
interval: "weekly"
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/step-setup-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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}"

Expand Down
44 changes: 22 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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: "."
Expand All @@ -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
Expand All @@ -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}"
Expand All @@ -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)"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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}"
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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!"
Expand All @@ -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!"
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

<a href="https://www.statuscake.com" title="Website Uptime Monitoring"><img src="https://app.statuscake.com/button/index.php?Track=7031389&Days=1&Design=1" /></a>

Expand Down

0 comments on commit 0c1e472

Please sign in to comment.