Merge branch 'unstable' into update-libp2p-branch
This commit is contained in:
commit
b737a073fc
|
@ -33,7 +33,7 @@ jobs:
|
||||||
cpu: amd64
|
cpu: amd64
|
||||||
- os: windows
|
- os: windows
|
||||||
cpu: amd64
|
cpu: amd64
|
||||||
branch: [~, upstream/version-1-6, upstream/version-2-0]
|
branch: [~, upstream/version-1-6, v2.0.4]
|
||||||
exclude:
|
exclude:
|
||||||
- target:
|
- target:
|
||||||
os: macos
|
os: macos
|
||||||
|
@ -47,7 +47,7 @@ jobs:
|
||||||
include:
|
include:
|
||||||
- branch: upstream/version-1-6
|
- branch: upstream/version-1-6
|
||||||
branch-short: version-1-6
|
branch-short: version-1-6
|
||||||
- branch: upstream/version-2-0
|
- branch: v2.0.4
|
||||||
branch-short: version-2-0
|
branch-short: version-2-0
|
||||||
nimflags-extra: --mm:refc
|
nimflags-extra: --mm:refc
|
||||||
- target:
|
- target:
|
||||||
|
|
|
@ -74,7 +74,7 @@ export
|
||||||
tables, results, endians2, json_serialization, sszTypes, beacon_time, crypto,
|
tables, results, endians2, json_serialization, sszTypes, beacon_time, crypto,
|
||||||
digest, presets
|
digest, presets
|
||||||
|
|
||||||
const SPEC_VERSION* = "1.4.0"
|
const SPEC_VERSION* = "1.5.0-alpha.0"
|
||||||
## Spec version we're aiming to be compatible with, right now
|
## Spec version we're aiming to be compatible with, right now
|
||||||
|
|
||||||
const
|
const
|
||||||
|
|
|
@ -393,7 +393,7 @@ template fcSuite(suiteName: static[string], testPathElem: static[string]) =
|
||||||
let testsPath = presetPath/path/testPathElem
|
let testsPath = presetPath/path/testPathElem
|
||||||
if kind != pcDir or not os_ops.dirExists(testsPath):
|
if kind != pcDir or not os_ops.dirExists(testsPath):
|
||||||
continue
|
continue
|
||||||
if testsPath.contains("/eip6110/") or testsPath.contains("\\eip6110\\"):
|
if testsPath.contains("/electra/") or testsPath.contains("\\electra\\"):
|
||||||
continue
|
continue
|
||||||
let fork = forkForPathComponent(path).valueOr:
|
let fork = forkForPathComponent(path).valueOr:
|
||||||
raiseAssert "Unknown test fork: " & testsPath
|
raiseAssert "Unknown test fork: " & testsPath
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 4bbc43ab55337788143a06ea7c055462b17b950a
|
Subproject commit 1c29412737b0228a20b410fceb7767d9e787eed0
|
Loading…
Reference in New Issue