From 263216d4197856254f20268dff472c1b330e58b2 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 27 Mar 2021 13:55:00 +0100 Subject: [PATCH] chore: replace master by main as default branch --- .drone.jsonnet | 12 ++++++------ .drone.yml | 26 +++++++++++++------------- .github/settings.yml | 4 ++-- README.md | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 5eef2f5..414ae95 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -22,7 +22,7 @@ local PipelineTest = { }, ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -69,7 +69,7 @@ local PipelineBuildPackage = { 'test', ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -107,7 +107,7 @@ local PipelineBuildContainer(arch='amd64') = { password: { from_secret: 'docker_password' }, }, when: { - ref: ['refs/heads/master', 'refs/tags/**'], + ref: ['refs/heads/main', 'refs/tags/**'], }, }, { @@ -123,7 +123,7 @@ local PipelineBuildContainer(arch='amd64') = { password: { from_secret: 'quay_password' }, }, when: { - ref: ['refs/heads/master', 'refs/tags/**'], + ref: ['refs/heads/main', 'refs/tags/**'], }, }, ], @@ -131,7 +131,7 @@ local PipelineBuildContainer(arch='amd64') = { 'test', ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -226,7 +226,7 @@ local PipelineNotifications = { 'build-container-arm64', ], 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 fafceea..c16e571 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -61,7 +61,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -104,7 +104,7 @@ steps: from_secret: docker_username when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - name: publish-quay @@ -121,12 +121,12 @@ steps: from_secret: quay_username when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -169,7 +169,7 @@ steps: from_secret: docker_username when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - name: publish-quay @@ -186,12 +186,12 @@ steps: from_secret: quay_username when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -234,7 +234,7 @@ steps: from_secret: docker_username when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - name: publish-quay @@ -251,12 +251,12 @@ steps: from_secret: quay_username when: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -346,7 +346,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** status: - success @@ -359,6 +359,6 @@ depends_on: --- kind: signature -hmac: b13616fead2f7e74acb1de005f187debac0ff31355cbcd12ac2e7bc2e5a80239 +hmac: e5b493ca16ac60cad643d506e88920384b9c07494d7d0cf854f798a0ca08e2dc ... diff --git a/.github/settings.yml b/.github/settings.yml index 7546ee3..c2ef054 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -8,7 +8,7 @@ repository: has_wiki: false has_downloads: true - default_branch: master + default_branch: main allow_squash_merge: true allow_merge_commit: true @@ -44,7 +44,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 c1749f2..722980b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Poor-mans docker service synchronizer [![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/wait-for) [![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/wait-for)](https://github.com/thegeeklab/wait-for/graphs/contributors) [![Source: GitHub](https://img.shields.io/badge/source-github-blue.svg?logo=github&logoColor=white)](https://github.com/thegeeklab/wait-for) -[![License: MIT](https://img.shields.io/github/license/thegeeklab/wait-for)](https://github.com/thegeeklab/wait-for/blob/master/LICENSE) +[![License: MIT](https://img.shields.io/github/license/thegeeklab/wait-for)](https://github.com/thegeeklab/wait-for/blob/main/LICENSE) wait-for is a script designed to synchronize services like docker containers. It is [sh](https://en.wikipedia.org/wiki/Bourne_shell) and [alpine](https://alpinelinux.org/) compatible and was forked from [eficode/wait-for](https://github.com/eficode/wait-for). @@ -60,8 +60,8 @@ services: ## Contributors Special thanks goes to all [contributors](https://github.com/thegeeklab/wait-for/graphs/contributors). If you would like to contribute, -please see the [instructions](https://github.com/thegeeklab/wait-for/blob/master/CONTRIBUTING.md). +please see the [instructions](https://github.com/thegeeklab/wait-for/blob/main/CONTRIBUTING.md). ## License -This project is licensed under the MIT License - see the [LICENSE](https://github.com/thegeeklab/wait-for/blob/master/LICENSE) file for details. +This project is licensed under the MIT License - see the [LICENSE](https://github.com/thegeeklab/wait-for/blob/main/LICENSE) file for details.