Merge branch 'ethereum:master' into portal

optimism-java · May 10, 2024 · 949cb00 · 949cb00
2 parents c23c10f + 74edc93
commit 949cb00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -97,6 +97,7 @@ jobs:
 
     # These builders run the tests
     - stage: build
+      if: type = push
       os: linux
       arch: amd64
       dist: noble
@@ -105,6 +106,7 @@ jobs:
         - travis_wait 45 go run build/ci.go test $TEST_PACKAGES
 
     - stage: build
+      if: type = push
       os: linux
       dist: noble
       go: 1.21.x
@@ -146,5 +148,7 @@ jobs:
       os: linux
       dist: noble
       go: 1.22.x
+      env:
+        - racetests
       script:
-        - travis_wait 50 go run build/ci.go test  -race $TEST_PACKAGES
+        - travis_wait 60 go run build/ci.go test -race $TEST_PACKAGES
diff --git a/params/version.go b/params/version.go
@@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 1          // Major version component of the current release
 	VersionMinor = 14         // Minor version component of the current release
-	VersionPatch = 3          // Patch version component of the current release
+	VersionPatch = 4          // Patch version component of the current release
 	VersionMeta  = "unstable" // Version metadata to append to the version string
 )