nimble: better isdir check (#6825)

* nimble: better isdir check

The current one seems to not find the file sometimes - also update
nimble file to something more useful.

* nanny
This commit is contained in:
Jacek Sieka 2025-01-07 23:45:42 +01:00 committed by GitHub
parent d820706478
commit 3e2d8d2a16
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 10 deletions

View File

@ -253,7 +253,7 @@ jobs:
- name: Check copyright year - name: Check copyright year
if: ${{ !cancelled() }} && github.event_name == 'pull_request' if: ${{ !cancelled() }} && github.event_name == 'pull_request'
run: | 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" excluded_extensions="ans|bin|cfg|yml|json|json\\.template|md|png|service|ssz|txt|lock|nix|gitignore|envrc"
current_year=$(date +"%Y") current_year=$(date +"%Y")

View File

@ -7,7 +7,7 @@
mode = ScriptMode.Verbose mode = ScriptMode.Verbose
version = "1.4.2" version = "24.12.0"
author = "Status Research & Development GmbH" author = "Status Research & Development GmbH"
description = "The Nimbus beacon chain node is a highly efficient Ethereum 2.0 client" description = "The Nimbus beacon chain node is a highly efficient Ethereum 2.0 client"
license = "MIT or Apache License 2.0" license = "MIT or Apache License 2.0"
@ -45,13 +45,15 @@ requires(
"unittest2", "unittest2",
"web3", "web3",
"zlib", "zlib",
"toml_serialization",
"https://github.com/status-im/nim-kzg4844.git",
"zxcvbn" "zxcvbn"
) )
requires "https://github.com/status-im/nimbus-security-resources.git" requires "https://github.com/status-im/nimbus-security-resources.git"
import std/tables import std/tables
let namedBin = { namedBin = {
"beacon_chain/nimbus_beacon_node": "nimbus_beacon_node", "beacon_chain/nimbus_beacon_node": "nimbus_beacon_node",
"beacon_chain/nimbus_validator_client": "nimbus_validator_client", "beacon_chain/nimbus_validator_client": "nimbus_validator_client",
"ncli/ncli": "ncli", "ncli/ncli": "ncli",

View File

@ -11,13 +11,9 @@ import std/strutils
const currentDir = currentSourcePath()[0 .. ^(len("config.nims") + 1)] const currentDir = currentSourcePath()[0 .. ^(len("config.nims") + 1)]
if getEnv("NIMBUS_BUILD_SYSTEM") == "yes" and when withDir(thisDir(), system.fileExists("nimbus-build-system.paths")):
# BEWARE if getEnv("NIMBUS_BUILD_SYSTEM") == "yes":
# In Nim 1.6, config files are evaluated with a working directory include "nimbus-build-system.paths"
# 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"
const nimCachePathOverride {.strdefine.} = "" const nimCachePathOverride {.strdefine.} = ""
when nimCachePathOverride == "": when nimCachePathOverride == "":