aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2022-02-08 16:16:01 +0000
committerNeil Alexander <neilalexander@users.noreply.github.com>2022-02-08 16:16:01 +0000
commit8a1dfffe3dc7e720964820301f58a7a9e50d5ee6 (patch)
tree3f125ffcb9fd8ea2d285b1287d5d0ffe8667b462 /.github
parent0e26662a552b671ef201490defbbea59df4250c1 (diff)
Various updates for renaming the `master` branch to `main`
Diffstat (limited to '.github')
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md2
-rw-r--r--.github/workflows/codeql-analysis.yml30
-rw-r--r--.github/workflows/tests.yml6
3 files changed, 19 insertions, 19 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1204582e..8014e941 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,6 +2,6 @@
<!-- Please read docs/CONTRIBUTING.md before submitting your pull request -->
-* [ ] Pull request includes a [sign off](https://github.com/matrix-org/dendrite/blob/master/docs/CONTRIBUTING.md#sign-off)
+* [ ] Pull request includes a [sign off](https://github.com/matrix-org/dendrite/blob/main/docs/CONTRIBUTING.md#sign-off)
Signed-off-by: `Your Name <your@email.example.org>`
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a4ef8b39..de6c79dd 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -2,9 +2,9 @@ name: "CodeQL"
on:
push:
- branches: [master]
+ branches: [main]
pull_request:
- branches: [master]
+ branches: [main]
jobs:
analyze:
@@ -14,21 +14,21 @@ jobs:
strategy:
fail-fast: false
matrix:
- language: ['go']
+ language: ["go"]
steps:
- - name: Checkout repository
- uses: actions/checkout@v2
- with:
- fetch-depth: 2
+ - name: Checkout repository
+ uses: actions/checkout@v2
+ with:
+ fetch-depth: 2
- - run: git checkout HEAD^2
- if: ${{ github.event_name == 'pull_request' }}
+ - run: git checkout HEAD^2
+ if: ${{ github.event_name == 'pull_request' }}
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v1
- with:
- languages: ${{ matrix.language }}
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v1
+ with:
+ languages: ${{ matrix.language }}
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ad5a2660..4a172029 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,7 +2,7 @@ name: Tests
on:
push:
- branches: [ 'master' ]
+ branches: ["main"]
pull_request:
concurrency:
@@ -33,7 +33,7 @@ jobs:
path: dendrite
# Attempt to check out the same branch of Complement as the PR. If it
- # doesn't exist, fallback to master.
+ # doesn't exist, fallback to main.
- name: Checkout complement
shell: bash
run: |
@@ -68,4 +68,4 @@ jobs:
name: Run Complement Tests
env:
COMPLEMENT_BASE_IMAGE: complement-dendrite:latest
- working-directory: complement \ No newline at end of file
+ working-directory: complement