mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 06:06:44 +00:00
Merge branch 'main' of github.com:berachain/bera-geth into fetch-upstream
This commit is contained in:
commit
425b0306b5
3 changed files with 4 additions and 4 deletions
2
.github/CONTRIBUTING.md
vendored
2
.github/CONTRIBUTING.md
vendored
|
|
@ -21,7 +21,7 @@ Please make sure your contributions adhere to our coding guidelines:
|
||||||
(i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
|
(i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
|
||||||
* Code must be documented adhering to the official Go
|
* Code must be documented adhering to the official Go
|
||||||
[commentary](https://golang.org/doc/effective_go.html#commentary) guidelines.
|
[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.
|
* Commit messages should be prefixed with the package(s) they modify.
|
||||||
* E.g. "eth, rpc: make trace configs optional"
|
* E.g. "eth, rpc: make trace configs optional"
|
||||||
|
|
||||||
|
|
|
||||||
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
|
@ -2,9 +2,9 @@ name: i386 linux tests
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master ]
|
branches: [ main ]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ master ]
|
branches: [ main ]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
|
||||||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
|
|
@ -2,7 +2,7 @@ on:
|
||||||
# TODO: fix release workflow and enable this.
|
# TODO: fix release workflow and enable this.
|
||||||
# push:
|
# push:
|
||||||
# branches:
|
# branches:
|
||||||
# - "master"
|
# - "main"
|
||||||
# tags:
|
# tags:
|
||||||
# - "v*"
|
# - "v*"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue