Skip to content

Commit 8a1dfff

Browse files
committed
Various updates for renaming the master branch to main
1 parent 0e26662 commit 8a1dfff

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
<!-- Please read docs/CONTRIBUTING.md before submitting your pull request -->
44

5-
* [ ] Pull request includes a [sign off](https://github.com/matrix-org/dendrite/blob/master/docs/CONTRIBUTING.md#sign-off)
5+
* [ ] Pull request includes a [sign off](https://github.com/matrix-org/dendrite/blob/main/docs/CONTRIBUTING.md#sign-off)
66

77
Signed-off-by: `Your Name <[email protected]>`

.github/workflows/codeql-analysis.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: "CodeQL"
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
7-
branches: [master]
7+
branches: [main]
88

99
jobs:
1010
analyze:
@@ -14,21 +14,21 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
language: ['go']
17+
language: ["go"]
1818

1919
steps:
20-
- name: Checkout repository
21-
uses: actions/checkout@v2
22-
with:
23-
fetch-depth: 2
20+
- name: Checkout repository
21+
uses: actions/checkout@v2
22+
with:
23+
fetch-depth: 2
2424

25-
- run: git checkout HEAD^2
26-
if: ${{ github.event_name == 'pull_request' }}
25+
- run: git checkout HEAD^2
26+
if: ${{ github.event_name == 'pull_request' }}
2727

28-
- name: Initialize CodeQL
29-
uses: github/codeql-action/init@v1
30-
with:
31-
languages: ${{ matrix.language }}
28+
- name: Initialize CodeQL
29+
uses: github/codeql-action/init@v1
30+
with:
31+
languages: ${{ matrix.language }}
3232

33-
- name: Perform CodeQL Analysis
34-
uses: github/codeql-action/analyze@v1
33+
- name: Perform CodeQL Analysis
34+
uses: github/codeql-action/analyze@v1

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Tests
22

33
on:
44
push:
5-
branches: [ 'master' ]
5+
branches: ["main"]
66
pull_request:
77

88
concurrency:
@@ -33,7 +33,7 @@ jobs:
3333
path: dendrite
3434

3535
# Attempt to check out the same branch of Complement as the PR. If it
36-
# doesn't exist, fallback to master.
36+
# doesn't exist, fallback to main.
3737
- name: Checkout complement
3838
shell: bash
3939
run: |
@@ -68,4 +68,4 @@ jobs:
6868
name: Run Complement Tests
6969
env:
7070
COMPLEMENT_BASE_IMAGE: complement-dendrite:latest
71-
working-directory: complement
71+
working-directory: complement

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if [ -d ".git" ]
77
then
88
export BUILD=`git rev-parse --short HEAD || ""`
99
export BRANCH=`(git symbolic-ref --short HEAD | tr -d \/ ) || ""`
10-
if [ "$BRANCH" = master ]
10+
if [ "$BRANCH" = main ]
1111
then
1212
export BRANCH=""
1313
fi

docs/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ If a job fails, click the "details" button and you should be taken to the job's
3737
logs.
3838

3939
![Click the details button on the failing build
40-
step](https://raw.githubusercontent.com/matrix-org/dendrite/master/docs/images/details-button-location.jpg)
40+
step](https://raw.githubusercontent.com/matrix-org/dendrite/main/docs/images/details-button-location.jpg)
4141

4242
Scroll down to the failing step and you should see some log output. Scan the
4343
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.
5757

5858
Once the code builds, run [Sytest](https://github.com/matrix-org/sytest)
5959
according to the guide in
60-
[docs/sytest.md](https://github.com/matrix-org/dendrite/blob/master/docs/sytest.md#using-a-sytest-docker-image)
60+
[docs/sytest.md](https://github.com/matrix-org/dendrite/blob/main/docs/sytest.md#using-a-sytest-docker-image)
6161
so you can see whether something is being broken and whether there are newly
6262
passing tests.
6363

@@ -94,4 +94,4 @@ For more general questions please use
9494

9595
We ask that everyone who contributes to the project signs off their
9696
contributions, in accordance with the
97-
[DCO](https://github.com/matrix-org/matrix-doc/blob/master/CONTRIBUTING.rst#sign-off).
97+
[DCO](https://github.com/matrix-org/matrix-doc/blob/main/CONTRIBUTING.rst#sign-off).

docs/p2p.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ These are the instructions for setting up P2P Dendrite, current as of May 2020.
66

77
#### Build
88

9-
- The `master` branch has a WASM-only binary for dendrite: `./cmd/dendritejs`.
9+
- The `main` branch has a WASM-only binary for dendrite: `./cmd/dendritejs`.
1010
- Build it and copy assets to riot-web.
1111
```
1212
$ ./build-dendritejs.sh

0 commit comments

Comments
 (0)