From 0a0fdb7c8184126bb31a7f8302000f4eb92e2577 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 30 Dec 2020 15:11:26 +0100 Subject: [PATCH] chore: replace master by main as default branch --- .drone.jsonnet | 20 ++++++------- .drone.yml | 34 +++++++++++----------- .github/settings.yml | 4 +-- README.md | 6 ++-- docs/config.yaml | 2 +- docs/content/_index.md | 2 +- docs/content/build_rules/standards_file.md | 2 +- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index c724255..582d9e4 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -40,7 +40,7 @@ local PipelineLint = { }, ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -87,7 +87,7 @@ local PipelineTest = { 'lint', ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -118,7 +118,7 @@ local PipelineSecurity = { 'test', ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -182,7 +182,7 @@ local PipelineBuildPackage = { 'security', ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -233,7 +233,7 @@ local PipelineBuildContainer(arch='amd64') = { password: { from_secret: 'docker_password' }, }, when: { - ref: ['refs/heads/master', 'refs/tags/**'], + ref: ['refs/heads/main', 'refs/tags/**'], }, depends_on: ['dryrun'], }, @@ -251,7 +251,7 @@ local PipelineBuildContainer(arch='amd64') = { password: { from_secret: 'quay_password' }, }, when: { - ref: ['refs/heads/master', 'refs/tags/**'], + ref: ['refs/heads/main', 'refs/tags/**'], }, depends_on: ['dryrun'], }, @@ -260,7 +260,7 @@ local PipelineBuildContainer(arch='amd64') = { 'security', ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -358,7 +358,7 @@ local PipelineDocs = { target: '/${DRONE_REPO_NAME}', }, when: { - ref: ['refs/heads/master', 'refs/tags/**'], + ref: ['refs/heads/main', 'refs/tags/**'], }, }, ], @@ -369,7 +369,7 @@ local PipelineDocs = { 'build-container-arm', ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -463,7 +463,7 @@ local PipelineNotifications = { 'docs', ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**'], + ref: ['refs/heads/main', 'refs/tags/**'], status: ['success', 'failure'], }, }; diff --git a/.drone.yml b/.drone.yml index 9c4c8ee..cf5ab6c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,7 +22,7 @@ image_pull_secrets: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -112,7 +112,7 @@ image_pull_secrets: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -143,7 +143,7 @@ image_pull_secrets: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -206,7 +206,7 @@ image_pull_secrets: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -262,7 +262,7 @@ steps: from_secret: docker_username when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** depends_on: - dryrun @@ -283,7 +283,7 @@ steps: from_secret: quay_username when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** depends_on: - dryrun @@ -293,7 +293,7 @@ image_pull_secrets: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -349,7 +349,7 @@ steps: from_secret: docker_username when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** depends_on: - dryrun @@ -370,7 +370,7 @@ steps: from_secret: quay_username when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** depends_on: - dryrun @@ -380,7 +380,7 @@ image_pull_secrets: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -436,7 +436,7 @@ steps: from_secret: docker_username when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** depends_on: - dryrun @@ -457,7 +457,7 @@ steps: from_secret: quay_username when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** depends_on: - dryrun @@ -467,7 +467,7 @@ image_pull_secrets: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -551,7 +551,7 @@ steps: target: /${DRONE_REPO_NAME} when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** image_pull_secrets: @@ -559,7 +559,7 @@ image_pull_secrets: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -655,7 +655,7 @@ image_pull_secrets: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** status: - success @@ -666,6 +666,6 @@ depends_on: --- kind: signature -hmac: eaff1a423a2b5218072b02e07b60be3fab4aa4da5908ddd750469fa9b15434a4 +hmac: 7b690a1d28ea6dbd7917de386e4bca384e1f7f4a776b4f3d46e53a89dedf5e8c ... diff --git a/.github/settings.yml b/.github/settings.yml index 4e1848f..ad91656 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -9,7 +9,7 @@ repository: has_wiki: false has_downloads: true - default_branch: master + default_branch: main allow_squash_merge: true allow_merge_commit: true @@ -45,7 +45,7 @@ labels: description: This will not be worked on branches: - - name: master + - name: main protection: required_pull_request_reviews: null required_status_checks: diff --git a/README.md b/README.md index cf90e0b..b1d86e8 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Another best practice scanner for Ansible roles and playbooks [![Codecov](https://img.shields.io/codecov/c/github/thegeeklab/ansible-later)](https://codecov.io/gh/thegeeklab/ansible-later) [![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/ansible-later)](https://github.com/thegeeklab/ansible-later/graphs/contributors) [![Source: GitHub](https://img.shields.io/badge/source-github-blue.svg?logo=github&logoColor=white)](https://github.com/thegeeklab/ansible-later) -[![License: MIT](https://img.shields.io/github/license/thegeeklab/ansible-later)](https://github.com/thegeeklab/ansible-later/blob/master/LICENSE) +[![License: MIT](https://img.shields.io/github/license/thegeeklab/ansible-later)](https://github.com/thegeeklab/ansible-later/blob/main/LICENSE) ansible-later is a best practice scanner and linting tool. In most cases, if you write Ansible roles in a team, it helps to have a coding or best practice guideline in place. This will make Ansible roles more readable for all maintainers and can reduce the troubleshooting time. @@ -30,10 +30,10 @@ You can find the full documentation at [https://ansible-later.geekdocs.de](https ## Contributors Special thanks goes to all [contributors](https://github.com/thegeeklab/ansible-later/graphs/contributors). If you would like to contribute, -please see the [instructions](https://github.com/thegeeklab/ansible-later/blob/master/CONTRIBUTING.md). +please see the [instructions](https://github.com/thegeeklab/ansible-later/blob/main/CONTRIBUTING.md). ansible-later is a fork of Will Thames [ansible-review](https://github.com/willthames/ansible-review). Thanks for your work on ansible-review and ansible-lint. ## License -This project is licensed under the MIT License - see the [LICENSE](https://github.com/thegeeklab/ansible-later/blob/master/LICENSE) file for details. +This project is licensed under the MIT License - see the [LICENSE](https://github.com/thegeeklab/ansible-later/blob/main/LICENSE) file for details. diff --git a/docs/config.yaml b/docs/config.yaml index c2c4205..bfbfcd3 100644 --- a/docs/config.yaml +++ b/docs/config.yaml @@ -22,7 +22,7 @@ params: geekdocToC: 3 geekdocRepo: https://github.com/thegeeklab/ansible-later - geekdocEditPath: edit/master/docs/content + geekdocEditPath: edit/main/docs/content geekdocDateFormat: "Jan 2, 2006" geekdocSearch: true diff --git a/docs/content/_index.md b/docs/content/_index.md index e6cedb6..aa98aed 100644 --- a/docs/content/_index.md +++ b/docs/content/_index.md @@ -11,7 +11,7 @@ title: Documentation [![Codecov](https://img.shields.io/codecov/c/github/thegeeklab/ansible-later)](https://codecov.io/gh/thegeeklab/ansible-later) [![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/ansible-later)](https://github.com/thegeeklab/ansible-later/graphs/contributors) [![Source: GitHub](https://img.shields.io/badge/source-github-blue.svg?logo=github&logoColor=white)](https://github.com/thegeeklab/ansible-later) -[![License: MIT](https://img.shields.io/github/license/thegeeklab/ansible-later)](https://github.com/thegeeklab/ansible-later/blob/master/LICENSE) +[![License: MIT](https://img.shields.io/github/license/thegeeklab/ansible-later)](https://github.com/thegeeklab/ansible-later/blob/main/LICENSE) ansible-later is a best practice scanner and linting tool. In most cases, if you write Ansible roles in a team, it helps to have a coding or best practice guideline in place. This will make Ansible roles more readable for all maintainers and can reduce the troubleshooting time. diff --git a/docs/content/build_rules/standards_file.md b/docs/content/build_rules/standards_file.md index 12f9839..1dec295 100644 --- a/docs/content/build_rules/standards_file.md +++ b/docs/content/build_rules/standards_file.md @@ -44,7 +44,7 @@ When you add new standards, you should increment the version of your standards. To add standards that are advisory, don't set the version. These will cause a message to be displayed but won't constitute a failure. When a standard version is higher than declared version, a message will be displayed 'WARN: Future standard' and won't constitute a failure. -An example standards file is available [here](https://github.com/thegeeklab/ansible-later/blob/master/ansiblelater/data/standards.py). +An example standards file is available [here](https://github.com/thegeeklab/ansible-later/blob/main/ansiblelater/data/standards.py). If you only want to check one or two standards quickly (perhaps you want to review your entire code base for deprecated bare words), you can use the `-s` flag with the name of your standard. You can pass `-s` multiple times.