From a07aac43957542882b9260ff28968c59b308a9ee Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 20 Jun 2022 22:20:22 +0200 Subject: [PATCH] chore: switch to main as default branch --- .drone.jsonnet | 10 +++++----- .drone.yml | 14 +++++++------- meta/main.yml | 2 +- molecule/centos7/tests/test_default.py | 4 ++-- molecule/rocky8/tests/test_default.py | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 439fb8e..a4bffd4 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -37,7 +37,7 @@ local PipelineLinting = { }, ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -71,7 +71,7 @@ local PipelineDeployment(scenario='centos7') = { 'linting', ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, }; @@ -107,12 +107,12 @@ local PipelineDocumentation = { target_branch: 'docs', }, when: { - ref: ['refs/heads/master'], + ref: ['refs/heads/main'], }, }, ], trigger: { - ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], }, depends_on: [ 'testing-centos7', @@ -148,7 +148,7 @@ local PipelineNotification = { ], trigger: { status: ['success', 'failure'], - ref: ['refs/heads/master', 'refs/tags/**'], + ref: ['refs/heads/main', 'refs/tags/**'], }, }; diff --git a/.drone.yml b/.drone.yml index 8ac55eb..9622c97 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,7 +30,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -60,7 +60,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -93,7 +93,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -132,11 +132,11 @@ steps: from_secret: gitea_username when: ref: - - refs/heads/master + - refs/heads/main trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** - refs/pull/** @@ -171,7 +171,7 @@ steps: trigger: ref: - - refs/heads/master + - refs/heads/main - refs/tags/** status: - success @@ -182,6 +182,6 @@ depends_on: --- kind: signature -hmac: 5189f926b42593bf4740977ffde8848f30cc267e0893382a4cd825bf3776f0fe +hmac: 6e63b0037e6b7edc299b5566b4b86a3205c03b8b16b8fe58f1579875ff4648bb ... diff --git a/meta/main.yml b/meta/main.yml index a784ade..8b62fa6 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -8,7 +8,7 @@ galaxy_info: # @meta description: > # [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.nginx) # [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.nginx?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.nginx) - # [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.nginx/src/branch/master/LICENSE) + # [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.nginx/src/branch/main/LICENSE) # # Setup [nginx](https://www.nginx.com/) webserver. Nginx is an open source reverse proxy server # for HTTP, HTTPS, SMTP, POP3, and IMAP protocols, as well as a load balancer, HTTP cache, and a diff --git a/molecule/centos7/tests/test_default.py b/molecule/centos7/tests/test_default.py index f6e3511..acb4880 100644 --- a/molecule/centos7/tests/test_default.py +++ b/molecule/centos7/tests/test_default.py @@ -20,8 +20,8 @@ def test_nginx_running_and_enabled(host): def test_nginx_process(host): # Verify worker procs are running - master = host.process.get(user="root", comm="nginx") - workers = host.process.filter(ppid=master.pid) + main = host.process.get(user="root", comm="nginx") + workers = host.process.filter(ppid=main.pid) assert len(workers) > 0 diff --git a/molecule/rocky8/tests/test_default.py b/molecule/rocky8/tests/test_default.py index f6e3511..acb4880 100644 --- a/molecule/rocky8/tests/test_default.py +++ b/molecule/rocky8/tests/test_default.py @@ -20,8 +20,8 @@ def test_nginx_running_and_enabled(host): def test_nginx_process(host): # Verify worker procs are running - master = host.process.get(user="root", comm="nginx") - workers = host.process.filter(ppid=master.pid) + main = host.process.get(user="root", comm="nginx") + workers = host.process.filter(ppid=main.pid) assert len(workers) > 0