diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a40c9c6f4..1e906a1d36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -253,7 +253,7 @@ jobs: - name: Check copyright year if: ${{ !cancelled() }} && github.event_name == 'pull_request' run: | - excluded_files="config.yaml" + excluded_files="config.yaml|config.nims|beacon_chain.nimble" excluded_extensions="ans|bin|cfg|yml|json|json\\.template|md|png|service|ssz|txt|lock|nix|gitignore|envrc" current_year=$(date +"%Y") diff --git a/beacon_chain.nimble b/beacon_chain.nimble index af2044ef27..2a3bba39d3 100644 --- a/beacon_chain.nimble +++ b/beacon_chain.nimble @@ -7,7 +7,7 @@ mode = ScriptMode.Verbose -version = "1.4.2" +version = "24.12.0" author = "Status Research & Development GmbH" description = "The Nimbus beacon chain node is a highly efficient Ethereum 2.0 client" license = "MIT or Apache License 2.0" @@ -45,13 +45,15 @@ requires( "unittest2", "web3", "zlib", + "toml_serialization", + "https://github.com/status-im/nim-kzg4844.git", "zxcvbn" ) requires "https://github.com/status-im/nimbus-security-resources.git" import std/tables -let namedBin = { +namedBin = { "beacon_chain/nimbus_beacon_node": "nimbus_beacon_node", "beacon_chain/nimbus_validator_client": "nimbus_validator_client", "ncli/ncli": "ncli", diff --git a/config.nims b/config.nims index f523d20d9a..1928e12f21 100644 --- a/config.nims +++ b/config.nims @@ -11,13 +11,9 @@ import std/strutils const currentDir = currentSourcePath()[0 .. ^(len("config.nims") + 1)] -if getEnv("NIMBUS_BUILD_SYSTEM") == "yes" and - # BEWARE - # In Nim 1.6, config files are evaluated with a working directory - # matching where the Nim command was invocated. This means that we - # must do all file existance checks with full absolute paths: - system.fileExists(currentDir & "nimbus-build-system.paths"): - include "nimbus-build-system.paths" +when withDir(thisDir(), system.fileExists("nimbus-build-system.paths")): + if getEnv("NIMBUS_BUILD_SYSTEM") == "yes": + include "nimbus-build-system.paths" const nimCachePathOverride {.strdefine.} = "" when nimCachePathOverride == "":