Skip to content

nimble: better isdir check #6825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tersec merged 2 commits into from
Jan 7, 2025
Merged

nimble: better isdir check #6825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1589a26
nimble: better isdir check
arnetheduck Jan 7, 2025
b8ccecf
nanny
arnetheduck Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 4 additions & 2 deletions beacon_chain.nimble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down
10 changes: 3 additions & 7 deletions config.nims
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 == "":
Expand Down