Skip to content

Allow overriding vars in the private envrc.vars #5394

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
nicu-da merged 1 commit into from
May 6, 2026
Merged

Allow overriding vars in the private envrc.vars #5394

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions .envrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,14 @@ use_flake_subdir() {
fi
}

# Private .envrc
[[ -f .envrc.private ]] && [[ -z "$IGNORE_PRIVATE_ENVRC" ]] && source_env .envrc.private || true
source_envrc_private() {
[[ -f .envrc.private ]] && [[ -z "$IGNORE_PRIVATE_ENVRC" ]] && source_env .envrc.private || true
}

# Source .envrc.private before use_flake_subdir because it provides ARTIFACTORY_PASSWORD
# which determines whether the enterprise or OSS nix shell is used.
# This workaround can be removed once the enterprise edition is removed.
source_envrc_private

# TODO(DACH-NY/canton-network-node#3876) work around for $TMPDIR is removed. #3876 to investigate more
OLD_TMPDIR=$TMPDIR
Expand All @@ -27,6 +33,10 @@ export TMPDIR=$OLD_TMPDIR

source_env .envrc.vars

# Re-source .envrc.private so it can override any vars from .envrc.vars
source_envrc_private


source "${TOOLS_LIB}/libcli.source"

source_env .envrc.validate
Expand Down
Loading