Skip to content

Commit bd2d5ae

Browse files
authored
update master to main (#216)
1 parent 6ba21c1 commit bd2d5ae

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/deploy.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Deploy
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
paths:
88
- infra/**
99
workflow_dispatch:
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
environment: dev_jon
1919
secrets: inherit
20-
if: github.ref == 'refs/heads/master'
20+
if: github.ref == 'refs/heads/main'
2121

2222
deploy_sn10_prod:
2323
name: Deploy to sn10 prod
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
environment: prod_sn10
2828
secrets: inherit
29-
if: github.ref == 'refs/heads/master'
29+
if: github.ref == 'refs/heads/main'
3030

3131
deploy_sn3_prod:
3232
name: Deploy to sn3 prod
@@ -35,4 +35,4 @@ jobs:
3535
with:
3636
environment: prod_sn3
3737
secrets: inherit
38-
if: github.ref == 'refs/heads/master'
38+
if: github.ref == 'refs/heads/main'

.github/workflows/sld_terraform.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ name: "SLD Terraform"
44
on:
55
push:
66
branches:
7-
- master
7+
- main
88
workflow_dispatch:
99
branches:
10-
- master
10+
- main
1111

1212
permissions: read-all
1313

@@ -52,9 +52,9 @@ jobs:
5252
run: terraform validate
5353

5454
- name: Terraform plan
55-
if: github.ref == 'refs/heads/master' && github.event_name == 'push'
55+
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
5656
run: terraform plan -no-color -input=false -parallelism=1
5757

5858
- name: Terraform Apply
59-
if: github.ref == 'refs/heads/master' && github.event_name == 'push'
59+
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
6060
run: terraform apply -auto-approve -input=false -parallelism=1

infra/ansible/roles/knot_authoritative/tasks/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
ansible.builtin.git:
6868
repo: "https://github.com/nycmeshnet/nycmesh-dns.git"
6969
dest: /root/nycmesh-dns
70-
version: master
70+
version: main
7171

7272
- name: Run deploy script
7373
ansible.builtin.command:

sld/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
1. Fork the repository if needed.
1111
2. Create a new branch.
1212
3. Add a new entry to the corresponding file `records.<DOMAIN>.tf`. Consult the [lexfrei/namedotcom documentation](https://registry.terraform.io/providers/lexfrei/namedotcom/latest/docs) as needed. The example below creates an `A` record pointed at `1.1.1.2`.
13-
4. Open a [pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request) to `master`.
13+
4. Open a [pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request) to `main`.
1414

1515
```
1616
resource "namedotcom_record" "record_test" {

0 commit comments

Comments
 (0)