From 2ee2bde9f21f9c6df07bc1f002524789e0e6a631 Mon Sep 17 00:00:00 2001 From: Niall Byrne <9848926+niall-byrne@users.noreply.github.com> Date: Tue, 12 Mar 2024 19:06:48 -0400 Subject: [PATCH] ci(GITHUB): move project from master -> main --- .github/actions/action-00-toolbox/action.yml | 2 +- .../0.toml_linting-0.workflow_linting.json | 4 +- .../0.toml_linting-1.workflow_linting.json | 4 +- .../1.toml_linting-0.workflow_linting.json | 4 +- .../1.toml_linting-1.workflow_linting.json | 4 +- .github/scripts/step-setup-environment.sh | 6 +-- .github/workflows/workflow-template-test.yml | 40 +++++++++---------- README.md | 10 ++--- cookiecutter.json | 4 +- scripts/update.sh | 4 +- .../.github/workflows/workflow-push.yml | 32 +++++++-------- {{cookiecutter.project_slug}}/README.md | 4 +- 12 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.github/actions/action-00-toolbox/action.yml b/.github/actions/action-00-toolbox/action.yml index f5ed646..b2bcc9e 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/scenarios/0.toml_linting-0.workflow_linting.json b/.github/scenarios/0.toml_linting-0.workflow_linting.json index 7884c0f..38a7461 100644 --- a/.github/scenarios/0.toml_linting-0.workflow_linting.json +++ b/.github/scenarios/0.toml_linting-0.workflow_linting.json @@ -7,11 +7,11 @@ "github_handle": "osx-provisioner", "author": "Niall Byrne", "email": "niall@niallbyrne.ca", - "_BRANCH_NAME_BASE": "master", + "_BRANCH_NAME_BASE": "main", "_BRANCH_NAME_DEVELOPMENT": "dev", "_CONFIG_DEFAULT_SHFMT_OPTIONS": "-i 2 -ci -sr", "_CONFIG_DEFAULT_SHELLCHECK_OPTIONS": "-e SC2317 -P SCRIPTDIR", - "_DOCKER_DEFAULT_CONTAINER": "ghcr.io/niall-byrne/cicd-tools:master", + "_DOCKER_DEFAULT_CONTAINER": "ghcr.io/niall-byrne/cicd-tools:main", "_GITHUB_CI_ACTIONLINT_SCRIPT_URL": "https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash", "_GITHUB_CI_DEFAULT_CONCURRENCY": 4, "_GITHUB_CI_DEFAULT_PYTHON_VERSIONS": ["3.9"], diff --git a/.github/scenarios/0.toml_linting-1.workflow_linting.json b/.github/scenarios/0.toml_linting-1.workflow_linting.json index e1409f2..7c37e0e 100644 --- a/.github/scenarios/0.toml_linting-1.workflow_linting.json +++ b/.github/scenarios/0.toml_linting-1.workflow_linting.json @@ -7,11 +7,11 @@ "github_handle": "osx-provisioner", "author": "Niall Byrne", "email": "niall@niallbyrne.ca", - "_BRANCH_NAME_BASE": "master", + "_BRANCH_NAME_BASE": "main", "_BRANCH_NAME_DEVELOPMENT": "dev", "_CONFIG_DEFAULT_SHFMT_OPTIONS": "-i 2 -ci -sr", "_CONFIG_DEFAULT_SHELLCHECK_OPTIONS": "-e SC2317 -P SCRIPTDIR", - "_DOCKER_DEFAULT_CONTAINER": "ghcr.io/niall-byrne/cicd-tools:master", + "_DOCKER_DEFAULT_CONTAINER": "ghcr.io/niall-byrne/cicd-tools:main", "_GITHUB_CI_ACTIONLINT_SCRIPT_URL": "https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash", "_GITHUB_CI_DEFAULT_CONCURRENCY": 4, "_GITHUB_CI_DEFAULT_PYTHON_VERSIONS": ["3.9"], diff --git a/.github/scenarios/1.toml_linting-0.workflow_linting.json b/.github/scenarios/1.toml_linting-0.workflow_linting.json index fc52051..8eb6e10 100644 --- a/.github/scenarios/1.toml_linting-0.workflow_linting.json +++ b/.github/scenarios/1.toml_linting-0.workflow_linting.json @@ -7,11 +7,11 @@ "github_handle": "osx-provisioner", "author": "Niall Byrne", "email": "niall@niallbyrne.ca", - "_BRANCH_NAME_BASE": "master", + "_BRANCH_NAME_BASE": "main", "_BRANCH_NAME_DEVELOPMENT": "dev", "_CONFIG_DEFAULT_SHFMT_OPTIONS": "-i 2 -ci -sr", "_CONFIG_DEFAULT_SHELLCHECK_OPTIONS": "-e SC2317 -P SCRIPTDIR", - "_DOCKER_DEFAULT_CONTAINER": "ghcr.io/niall-byrne/cicd-tools:master", + "_DOCKER_DEFAULT_CONTAINER": "ghcr.io/niall-byrne/cicd-tools:main", "_GITHUB_CI_ACTIONLINT_SCRIPT_URL": "https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash", "_GITHUB_CI_DEFAULT_CONCURRENCY": 4, "_GITHUB_CI_DEFAULT_PYTHON_VERSIONS": ["3.9"], diff --git a/.github/scenarios/1.toml_linting-1.workflow_linting.json b/.github/scenarios/1.toml_linting-1.workflow_linting.json index 9d231b3..588718e 100644 --- a/.github/scenarios/1.toml_linting-1.workflow_linting.json +++ b/.github/scenarios/1.toml_linting-1.workflow_linting.json @@ -7,11 +7,11 @@ "github_handle": "osx-provisioner", "author": "Niall Byrne", "email": "niall@niallbyrne.ca", - "_BRANCH_NAME_BASE": "master", + "_BRANCH_NAME_BASE": "main", "_BRANCH_NAME_DEVELOPMENT": "dev", "_CONFIG_DEFAULT_SHFMT_OPTIONS": "-i 2 -ci -sr", "_CONFIG_DEFAULT_SHELLCHECK_OPTIONS": "-e SC2317 -P SCRIPTDIR", - "_DOCKER_DEFAULT_CONTAINER": "ghcr.io/niall-byrne/cicd-tools:master", + "_DOCKER_DEFAULT_CONTAINER": "ghcr.io/niall-byrne/cicd-tools:main", "_GITHUB_CI_ACTIONLINT_SCRIPT_URL": "https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash", "_GITHUB_CI_DEFAULT_CONCURRENCY": 4, "_GITHUB_CI_DEFAULT_PYTHON_VERSIONS": ["3.9"], diff --git a/.github/scripts/step-setup-environment.sh b/.github/scripts/step-setup-environment.sh index bc94f75..478dbf1 100755 --- 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'.) # TEST_PROJECT_NAME: The slugified name of the template when populated during testing. Should match any test GitHub repository in use. @@ -26,7 +26,7 @@ main() { PROJECT_OWNER="niall-byrne" TEST_PROJECT_NAME="profile-example" - TEMPLATE_BRANCH_NAME_BASE="master" + TEMPLATE_BRANCH_NAME_BASE="main" TEMPLATE_BRANCH_NAME_DEVELOPMENT="dev" BRANCH_OR_TAG="$(echo "${GITHUB_REF}" | sed -E 's,refs/heads/|refs/tags/,,g')" @@ -40,7 +40,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}" echo "TEST_PROJECT_NAME=${TEST_PROJECT_NAME}" } >> "${GITHUB_ENV}" diff --git a/.github/workflows/workflow-template-test.yml b/.github/workflows/workflow-template-test.yml index 10023dd..9706356 100644 --- a/.github/workflows/workflow-template-test.yml +++ b/.github/workflows/workflow-template-test.yml @@ -21,12 +21,12 @@ on: jobs: configuration: - uses: niall-byrne/cicd-tools/.github/workflows/job-00-cookiecutter-read_configuration.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-cookiecutter-read_configuration.yml@main start: secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/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!" @@ -35,7 +35,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/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: VERBOSE_NOTIFICATIONS: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_VERBOSE_NOTIFICATIONS }} @@ -43,7 +43,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-30-cookiecutter-markdown_links.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-30-cookiecutter-markdown_links.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} CONFIG_FILE: "{{cookiecutter.project_slug}}/.github/config/actions/gaurav-nelson-github-action-markdown-link-check.json" @@ -54,7 +54,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-50-cookiecutter-test_precommit_hooks.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-50-cookiecutter-test_precommit_hooks.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} ENABLED_PRECOMMIT_CHECKS: '["test_ansible_lint_fails", "test_commit_lint_fails", "test_commit_spelling_fails", "test_credentials_fails", "test_shell_lint_fails", "test_shell_format_fails", "test_toml_lint_fails", "test_toml_lint_passes", "test_workflow_lint_fails", "test_workflow_header_lint_fails"]' @@ -66,7 +66,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-40-cookiecutter-ansible_lint.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-cookiecutter-ansible_lint.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} GALAXY_REQUIREMENTS_PATH: "profile/requirements.yml" @@ -78,7 +78,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}" @@ -92,7 +92,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)" @@ -108,7 +108,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/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.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} PRECOMMIT_HOOK_ID: "check-jsonschema" @@ -120,7 +120,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-cookiecutter-precommit_commit_stage_hook.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-cookiecutter-precommit_commit_stage_hook.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} PRECOMMIT_HOOK_ID: "lint-markdown" @@ -132,7 +132,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-cookiecutter-precommit_commit_stage_hook.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-cookiecutter-precommit_commit_stage_hook.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} PRECOMMIT_HOOK_ID: "spelling-markdown" @@ -153,7 +153,7 @@ jobs: - id: "lint-shell" name: "Shell Linting" max-parallel: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} - uses: niall-byrne/cicd-tools/.github/workflows/job-80-cookiecutter-precommit_commit_stage_hook.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-cookiecutter-precommit_commit_stage_hook.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} PRECOMMIT_HOOK_ID: ${{ matrix.hook.id }} @@ -165,7 +165,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-80-cookiecutter-precommit_commit_stage_hook.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-cookiecutter-precommit_commit_stage_hook.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} PRECOMMIT_HOOK_ID: "format-toml" @@ -185,7 +185,7 @@ jobs: - id: "lint-github-workflow-header" name: "Workflow Header Linting" max-parallel: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} - uses: niall-byrne/cicd-tools/.github/workflows/job-80-cookiecutter-precommit_commit_stage_hook.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-cookiecutter-precommit_commit_stage_hook.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} PRECOMMIT_HOOK_ID: ${{ matrix.hook.id }} @@ -197,7 +197,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-80-cookiecutter-precommit_commit_stage_hook.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-cookiecutter-precommit_commit_stage_hook.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} PRECOMMIT_HOOK_ID: "yamllint" @@ -212,7 +212,7 @@ jobs: REMOTE_TOKEN: ${{ secrets.REMOTE_TOKEN }} REMOTE_ORIGIN: ${{ secrets.REMOTE_ORIGIN }} SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-60-cookiecutter-remote_push.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-60-cookiecutter-remote_push.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_CONCURRENCY }} PYTHON_VERSIONS: ${{ toJSON(fromJSON(needs.configuration.outputs.COOKIECUTTER_CONFIGURATION)._GITHUB_CI_DEFAULT_PYTHON_VERSIONS) }} @@ -229,7 +229,7 @@ jobs: secrets: REMOTE_ORIGIN: ${{ secrets.REMOTE_ORIGIN }} SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-95-mac_maker-apply_profile.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-95-mac_maker-apply_profile.yml@main with: CACHE_FOLDERS: | ~/.asdf @@ -246,17 +246,17 @@ jobs: needs: [configuration, mac_maker_apply_test] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-99-poetry-create_release.yml@master + uses: cicd-tools-org/cicd-tools/.github/workflows/job-99-poetry-create_release.yml@main with: APPENDED_CONTENT: | ## Release Checklist - - [] Ensure master is synchronized with the release tag. + - [] Ensure main is synchronized with the release tag. success: needs: [create_release] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/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: "workflow has completed successfully!" diff --git a/README.md b/README.md index fd1a83a..61b04e0 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ The configuration files themselves comprise a customized [Ansible](https://www.ansible.com/) playbook, allowing you to leverage Ansible's robust tool chain with minimal fuss. -##### Master Branch (Follows the latest production tag) -[![profile-generator-template-test](https://github.com/osx-provisioner/profile-generator/actions/workflows/workflow-template-test.yml/badge.svg?branch=master)](https://github.com/osx-provisioner/profile-generator/actions/workflows/workflow-template-test.yml) +##### Main Branch (Follows the latest production tag) +[![profile-generator-template-test](https://github.com/osx-provisioner/profile-generator/actions/workflows/workflow-template-test.yml/badge.svg?branch=main)](https://github.com/osx-provisioner/profile-generator/actions/workflows/workflow-template-test.yml) ##### Dev Branch [![profile-generator-template-test](https://github.com/osx-provisioner/profile-generator/actions/workflows/workflow-template-test.yml/badge.svg?branch=dev)](https://github.com/osx-provisioner/profile-generator/actions/workflows/workflow-template-test.yml) @@ -144,7 +144,7 @@ These hooks all rely on 3rd party software to perform different types of static - Other steps require the use of binaries that you may not be familiar with. (See the [complete list](#default-pre-commit-hooks) in the next section.) To simplify the process of seamlessly installing these 3rd party tools we leverage containers: -- [CICD-Tools](https://github.com/cicd-tools-org/cicd-tools) provides several vetted binaries via its own [container](https://github.com/cicd-tools-org/cicd-tools/blob/master/.cicd-tools/container/Dockerfile). +- [CICD-Tools](https://github.com/cicd-tools-org/cicd-tools) provides several vetted binaries via its own [container](https://github.com/cicd-tools-org/cicd-tools/blob/main/.cicd-tools/container/Dockerfile). - There are additional binary tools configured to run in 3rd party containers following this same paradigm. **For this reason we strongly recommend installing a container runtime such as [Docker](https://www.docker.com/) or [Colima](https://github.com/abiosoft/colima) on your development machine.** @@ -228,9 +228,9 @@ The values you've entered into the [cookiecutter template](cookiecutter.json) de #### ii. Connecting Your New Repository Connect your new remote repository and push: -- Checkout the `master` branch: `git checkout master` +- Checkout the `main` branch: `git checkout main` - Add the new remote origin: `git remote add origin git@github.com:\/\.git` -- Push to the new remote origin: `git push -u origin master` +- Push to the new remote origin: `git push -u origin main` ### 3. Configuring Your Workflow diff --git a/cookiecutter.json b/cookiecutter.json index 9d231b3..588718e 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -7,11 +7,11 @@ "github_handle": "osx-provisioner", "author": "Niall Byrne", "email": "niall@niallbyrne.ca", - "_BRANCH_NAME_BASE": "master", + "_BRANCH_NAME_BASE": "main", "_BRANCH_NAME_DEVELOPMENT": "dev", "_CONFIG_DEFAULT_SHFMT_OPTIONS": "-i 2 -ci -sr", "_CONFIG_DEFAULT_SHELLCHECK_OPTIONS": "-e SC2317 -P SCRIPTDIR", - "_DOCKER_DEFAULT_CONTAINER": "ghcr.io/niall-byrne/cicd-tools:master", + "_DOCKER_DEFAULT_CONTAINER": "ghcr.io/niall-byrne/cicd-tools:main", "_GITHUB_CI_ACTIONLINT_SCRIPT_URL": "https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash", "_GITHUB_CI_DEFAULT_CONCURRENCY": 4, "_GITHUB_CI_DEFAULT_PYTHON_VERSIONS": ["3.9"], diff --git a/scripts/update.sh b/scripts/update.sh index 9968c85..ec6b810 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -36,8 +36,8 @@ main() { if [[ "$3" == "--force" ]]; then if git branch | grep "${PROFILE_GENERATOR_UPDATE_BRANCH}"; then set +eo pipefail - git checkout master - git reset origin/master + git checkout main + git reset origin/main git clean -fd . git branch -D "${PROFILE_GENERATOR_UPDATE_BRANCH}" rm -rf .git/cookiecutter diff --git a/{{cookiecutter.project_slug}}/.github/workflows/workflow-push.yml b/{{cookiecutter.project_slug}}/.github/workflows/workflow-push.yml index 9f799ec..d2273cc 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/workflow-push.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/workflow-push.yml @@ -20,14 +20,14 @@ on: jobs: configuration: - uses: niall-byrne/cicd-tools/.github/workflows/job-00-generic-read_json_file.yml@master + uses: niall-byrne/cicd-tools/.github/workflows/job-00-generic-read_json_file.yml@main with: JSON_FILE_PATH: ".github/config/workflows/workflow-push.json" start: secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-00-generic-notification.yml@master + uses: niall-byrne/cicd-tools/.github/workflows/job-00-generic-notification.yml@main with: NOTIFICATION_EMOJI: ":vertical_traffic_light:" NOTIFICATION_MESSAGE: "workflow has started!" @@ -36,7 +36,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-10-generic-security_scan_credentials.yml@master + uses: niall-byrne/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 }} @@ -45,7 +45,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-30-generic-markdown_links.yml@master + uses: niall-byrne/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" VERBOSE_NOTIFICATIONS: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_verbose_notifications }} @@ -54,7 +54,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-40-poetry-ansible_lint.yml@master + uses: niall-byrne/cicd-tools/.github/workflows/job-40-poetry-ansible_lint.yml@main with: CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }} EXTRA_ARGS: "install.yml" @@ -80,7 +80,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}" @@ -94,7 +94,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)" @@ -110,7 +110,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@master + uses: niall-byrne/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: "check-jsonschema" @@ -122,7 +122,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-markdown" @@ -134,7 +134,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: "spelling-markdown" @@ -155,7 +155,7 @@ jobs: - id: "lint-shell" name: "Shell Linting" max-parallel: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }} - uses: niall-byrne/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@master + uses: niall-byrne/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 }} @@ -169,7 +169,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@master + uses: niall-byrne/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" @@ -193,7 +193,7 @@ jobs: - id: "lint-github-workflow-header" name: "Workflow Header Linting" max-parallel: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }} - uses: niall-byrne/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@master + uses: niall-byrne/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 }} @@ -207,7 +207,7 @@ jobs: needs: [configuration] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@master + uses: niall-byrne/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: "yamllint" @@ -223,7 +223,7 @@ jobs: {%- raw %} secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-99-poetry-create_release.yml@master + uses: niall-byrne/cicd-tools/.github/workflows/job-99-poetry-create_release.yml@main with: JSON_APPENDED_CONTENT: ${{ toJSON(fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_extra_release_content) }} @@ -231,7 +231,7 @@ jobs: needs: [create_release] secrets: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - uses: niall-byrne/cicd-tools/.github/workflows/job-00-generic-notification.yml@master + uses: niall-byrne/cicd-tools/.github/workflows/job-00-generic-notification.yml@main with: NOTIFICATION_EMOJI: ":checkered_flag:" NOTIFICATION_MESSAGE: "workflow has completed successfully!" diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md index 61668df..ad4fd20 100644 --- a/{{cookiecutter.project_slug}}/README.md +++ b/{{cookiecutter.project_slug}}/README.md @@ -37,7 +37,7 @@ An OSX machine is of course the best platform to development your profile on, al You'll need [Python](https://www.python.org/) **3.9** or later, and a container runtime environment such as [Docker](https://www.docker.com/) or [Colima](https://github.com/abiosoft/colima) is strongly recommended. -Please see the complete template guide [here](https://github.com/osx-provisioner/profile-generator/blob/master/README.md#requirements). +Please see the complete template guide [here](https://github.com/osx-provisioner/profile-generator/blob/main/README.md#requirements). ## This Looks Complicated, How Can I Customize It? @@ -139,7 +139,7 @@ The python library [pre-commit](https://pre-commit.com/) is installed during tem **This hooks depend on the presence of a container runtime such as [Docker](https://www.docker.com/) or [Colima](https://github.com/abiosoft/colima) on your development machine.** -Complete documentation on these hooks can be found [here](https://github.com/osx-provisioner/profile-generator/blob/master/README.md#pre-commit-git-hooks). +Complete documentation on these hooks can be found [here](https://github.com/osx-provisioner/profile-generator/blob/main/README.md#pre-commit-git-hooks). ## Restricted Paths