Various updates for renaming the `master` branch to `main`
MODIFY
.github/PULL_REQUEST_TEMPLATE.md
.github/PULL_REQUEST_TEMPLATE.md
<!-- 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>`

MODIFY
.github/workflows/codeql-analysis.yml
.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,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- language: ['go']
+ language: ["go"]
steps:
- name: Checkout repository

MODIFY
.github/workflows/tests.yml
.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: |

MODIFY
build.sh
build.sh
@@ -7,7 +7,7 @@ if [ -d ".git" ]
then
export BUILD=`git rev-parse --short HEAD || ""`
export BRANCH=`(git symbolic-ref --short HEAD | tr -d \/ ) || ""`
- if [ "$BRANCH" = master ]
+ if [ "$BRANCH" = main ]
then
export BRANCH=""
fi

MODIFY
docs/CONTRIBUTING.md
docs/CONTRIBUTING.md
@@ -37,7 +37,7 @@ If a job fails, click the "details" button and you should be taken to the job's
logs.
![Click the details button on the failing build
-step](https://raw.githubusercontent.com/matrix-org/dendrite/master/docs/images/details-button-location.jpg)
+step](https://raw.githubusercontent.com/matrix-org/dendrite/main/docs/images/details-button-location.jpg)
Scroll down to the failing step and you should see some log output. Scan the
logs until you find what it's complaining about, fix it, submit a new commit,
@@ -57,7 +57,7 @@ significant amount of CPU and RAM.
Once the code builds, run [Sytest](https://github.com/matrix-org/sytest)
according to the guide in
-[docs/sytest.md](https://github.com/matrix-org/dendrite/blob/master/docs/sytest.md#using-a-sytest-docker-image)
+[docs/sytest.md](https://github.com/matrix-org/dendrite/blob/main/docs/sytest.md#using-a-sytest-docker-image)
so you can see whether something is being broken and whether there are newly
passing tests.
@@ -94,4 +94,4 @@ For more general questions please use
We ask that everyone who contributes to the project signs off their
contributions, in accordance with the
-[DCO](https://github.com/matrix-org/matrix-doc/blob/master/CONTRIBUTING.rst#sign-off).
+[DCO](https://github.com/matrix-org/matrix-doc/blob/main/CONTRIBUTING.rst#sign-off).

MODIFY
docs/p2p.md
docs/p2p.md
@@ -6,7 +6,7 @@ These are the instructions for setting up P2P Dendrite, current as of May 2020.
#### Build
-- The `master` branch has a WASM-only binary for dendrite: `./cmd/dendritejs`.
+- The `main` branch has a WASM-only binary for dendrite: `./cmd/dendritejs`.
- Build it and copy assets to riot-web.
```
$ ./build-dendritejs.sh

Various updates for renaming the `master` branch to `main`