Skip to content

Commit

Permalink
Replace master with main branch (#11629)
Browse files Browse the repository at this point in the history
Motivation:

We should not use master as branch name, better to switch to main

Modifications:

Replace master branch name with main

Result:

Use main as replacement for master
  • Loading branch information
normanmaurer committed Aug 30, 2021
1 parent d7580b5 commit 73d2492
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ name: Build project

on:
push:
branches: [ "master"]
branches: [ "main"]

schedule:
- cron: '30 1 * * 1' # At 01:30 on Monday, every Monday.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ name: Deploy project

on:
push:
branches: [ "master" ]
branches: [ "main" ]

schedule:
- cron: '30 1 * * 1' # At 01:30 on Monday, every Monday.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ name: Build PR

on:
pull_request:
branches: [ "master"]
branches: [ "main"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
ref: master
ref: main

- name: Set up JDK 11
uses: actions/setup-java@v1
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
working-directory: ./prepare-release-workspace/
if: ${{ failure() }}
# Rollback the release in case of an failure
run: bash ./.github/scripts/release_rollback.sh release.properties netty/netty master
run: bash ./.github/scripts/release_rollback.sh release.properties netty/netty main

deploy-staged-release:
runs-on: ubuntu-18.04
Expand Down Expand Up @@ -246,4 +246,4 @@ jobs:
working-directory: ./prepare-release-workspace/
if: ${{ failure() }}
# Rollback the release in case of an failure
run: bash ./.github/scripts/release_rollback.sh release.properties netty/netty master
run: bash ./.github/scripts/release_rollback.sh release.properties netty/netty main
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ name: "CodeQL"

on:
push:
branches: ["4.1", master]
branches: ["4.1", main]
pull_request:
# The branches below must be a subset of the branches above
branches: ["4.1", master]
branches: ["4.1", main]
schedule:
- cron: '0 13 * * 3'

Expand Down

0 comments on commit 73d2492

Please sign in to comment.