Skip to content

Commit d7888c0

Browse files
Merge branch 'main' into main
2 parents dee30dc + 17722f6 commit d7888c0

File tree

6 files changed

+126
-80
lines changed

6 files changed

+126
-80
lines changed

.github/workflows/cla.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: "CLA"
2+
on:
3+
issue_comment:
4+
types: [created]
5+
pull_request_target:
6+
types: [opened,closed,synchronize]
7+
8+
jobs:
9+
CLAAssistant:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: "CLA Assistant"
13+
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
14+
# Beta Release
15+
uses: contributor-assistant/github-action@v2.3.1
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.BOT }}
18+
# the below token should have repo scope and must be manually added by you in the repository's secret
19+
PERSONAL_ACCESS_TOKEN: ${{ secrets.BOT }}
20+
with:
21+
path-to-signatures: 'signatures-v2.json'
22+
path-to-document: 'https://github.com/is-cool-me/register/blob/main/terms.md' # e.g. a CLA or a DCO document
23+
# branch should not be protected
24+
branch: 'main'
25+
allowlist: icme-bot,bot*
26+
remote-organization-name: 'is-cool-me'
27+
remote-repository-name: 'cla'
+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Dependabot Pull Request Approve and Merge
2+
3+
on: pull_request_target
4+
5+
permissions:
6+
pull-requests: write
7+
contents: write
8+
9+
jobs:
10+
dependabot:
11+
runs-on: ubuntu-latest
12+
# Checking the actor will prevent your Action run failing on non-Dependabot
13+
# PRs but also ensures that it only does work for Dependabot PRs.
14+
if: ${{ github.actor == 'dependabot[bot]' }}
15+
steps:
16+
# This first step will fail if there's no metadata and so the approval
17+
# will not occur.
18+
- name: Dependabot metadata
19+
id: dependabot-metadata
20+
uses: dependabot/fetch-metadata@v1.1.1
21+
with:
22+
github-token: "${{ secrets.GITHUB_TOKEN }}"
23+
# Here the PR gets approved.
24+
- name: Approve a PR
25+
run: gh pr review --approve "$PR_URL"
26+
env:
27+
PR_URL: ${{ github.event.pull_request.html_url }}
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29+
# Finally, this sets the PR to allow auto-merging for patch and minor
30+
# updates if all checks pass
31+
- name: Enable auto-merge for Dependabot PRs
32+
if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
33+
run: gh pr merge --auto --squash "$PR_URL"
34+
env:
35+
PR_URL: ${{ github.event.pull_request.html_url }}
36+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/merge.yml

-79
This file was deleted.

.github/workflows/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- run: echo '{"cloudflare":{"TYPE":"CLOUDFLAREAPI","apitoken":"$CLOUDFLARE_API_TOKEN"}}' > ./creds.json
2525

2626
- name: Publish
27-
uses: is-cool-me/dnscontrol-action@v4.7.3
27+
uses: is-cool-me/dnscontrol-action@v4.8.2
2828
env:
2929
CLOUDFLARE_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
3030
with:

.github/workflows/validation.yml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Validation
2+
3+
on:
4+
pull_request:
5+
6+
push:
7+
branches: [main]
8+
paths:
9+
- "domains/**"
10+
- ".github/workflows/validation.yml"
11+
- "dnsconfig.js"
12+
13+
workflow_dispatch:
14+
15+
concurrency:
16+
group: ${{ github.ref }}-validation
17+
cancel-in-progress: true
18+
19+
jobs:
20+
dns:
21+
name: DNS
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v4
25+
26+
- name: Check
27+
uses: is-cool-me/dnscontrol-action@v4.8.2
28+
with:
29+
args: check
30+
config_file: "dnsconfig.js"
31+
32+
json:
33+
name: JSON
34+
runs-on: ubuntu-latest
35+
steps:
36+
- uses: actions/checkout@v4
37+
38+
- name: JSON Syntax Check
39+
uses: is-cool-me/json-syntax-check@v1
40+
with:
41+
pattern: "\\.json$"
42+
env:
43+
BASE: "domains/"

domains/reserved/is-cool.me.json

+19
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,25 @@
1515
"2606:50c0:8001::153",
1616
"2606:50c0:8002::153",
1717
"2606:50c0:8003::153"
18+
],
19+
20+
"MX": [
21+
{
22+
"priority": 10,
23+
"value": "mx1.improvmx.com"
24+
},
25+
26+
{
27+
"priority": 20,
28+
"value": "mx2.improvmx.com"
29+
}
30+
],
31+
32+
"TXT": [
33+
{
34+
"name": "@",
35+
"value": "v=spf1 include:spf.improvmx.com ~all"
36+
}
1837
]
1938
},
2039

0 commit comments

Comments
 (0)