mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-27 23:26:44 +00:00
Merge branch 'master' into v2.0.1-beta-candidate
This commit is contained in:
commit
24403e9df3
2 changed files with 5 additions and 5 deletions
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
|
@ -236,8 +236,8 @@ jobs:
|
||||||
- name: Launch devnet
|
- name: Launch devnet
|
||||||
run: |
|
run: |
|
||||||
cd matic-cli/devnet
|
cd matic-cli/devnet
|
||||||
bash ../docker_devnet.sh
|
bash ../util-scripts/docker/devnet_setup.sh
|
||||||
cd -
|
cd -
|
||||||
timeout 2m bash bor/integration-tests/bor_health.sh
|
timeout 2m bash bor/integration-tests/bor_health.sh
|
||||||
|
|
||||||
- name: Run smoke tests
|
- name: Run smoke tests
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,9 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
VersionMajor = 1 // Major version component of the current release
|
VersionMajor = 2 // Major version component of the current release
|
||||||
VersionMinor = 5 // Minor version component of the current release
|
VersionMinor = 0 // Minor version component of the current release
|
||||||
VersionPatch = 5 // Patch version component of the current release
|
VersionPatch = 0 // Patch version component of the current release
|
||||||
VersionMeta = "" // Version metadata to append to the version string
|
VersionMeta = "" // Version metadata to append to the version string
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue