diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 969b7f8f9f..2f4df38cbf 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -21,7 +21,7 @@ Please make sure your contributions adhere to our coding guidelines: (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)). * Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines. - * Pull requests need to be based on and opened against the `master` branch. + * Pull requests need to be based on and opened against the `main` branch. * Commit messages should be prefixed with the package(s) they modify. * E.g. "eth, rpc: make trace configs optional" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 634fc7f12f..10079d76c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: i386 linux tests on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] workflow_dispatch: jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9ae5dd0398..f79d048dff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ on: # TODO: fix release workflow and enable this. # push: # branches: - # - "master" + # - "main" # tags: # - "v*"