Skip to content

Commit 1e09a9f

Browse files
authored
Merge pull request #379 from OffchainLabs/merge-v1.14.3
Merge v1.14.3
2 parents 91a7a31 + 4f47f4c commit 1e09a9f

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

.travis.yml

+4-13
Original file line numberDiff line numberDiff line change
@@ -102,23 +102,14 @@ jobs:
102102
dist: noble
103103
go: 1.22.x
104104
script:
105-
- travis_wait 30 go run build/ci.go test $TEST_PACKAGES
106-
107-
- stage: build
108-
if: type = pull_request
109-
os: linux
110-
arch: arm64
111-
dist: noble
112-
go: 1.21.x
113-
script:
114-
- travis_wait 30 go run build/ci.go test $TEST_PACKAGES
105+
- travis_wait 45 go run build/ci.go test $TEST_PACKAGES
115106

116107
- stage: build
117108
os: linux
118109
dist: noble
119110
go: 1.21.x
120111
script:
121-
- travis_wait 30 go run build/ci.go test $TEST_PACKAGES
112+
- travis_wait 45 go run build/ci.go test $TEST_PACKAGES
122113

123114
# This builder does the Ubuntu PPA nightly uploads
124115
- stage: build
@@ -131,7 +122,7 @@ jobs:
131122
git:
132123
submodules: false # avoid cloning ethereum/tests
133124
before_install:
134-
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends install devscripts debhelper dput fakeroot python-bzrlib python-paramiko
125+
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends install devscripts debhelper dput fakeroot
135126
script:
136127
- echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts
137128
- go run build/ci.go debsrc -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <[email protected]>"
@@ -156,4 +147,4 @@ jobs:
156147
dist: noble
157148
go: 1.22.x
158149
script:
159-
- travis_wait 30 go run build/ci.go test -race $TEST_PACKAGES
150+
- travis_wait 50 go run build/ci.go test -race $TEST_PACKAGES

params/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
const (
2424
VersionMajor = 1 // Major version component of the current release
2525
VersionMinor = 14 // Minor version component of the current release
26-
VersionPatch = 2 // Patch version component of the current release
26+
VersionPatch = 3 // Patch version component of the current release
2727
VersionMeta = "stable" // Version metadata to append to the version string
2828
)
2929

0 commit comments

Comments
 (0)