Skip to content
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

Do not override RELEASE_DISTRIBUTION in release to allow rpc #2922

Merged
merged 2 commits into from
Jan 30, 2025
Merged

Do not override RELEASE_DISTRIBUTION in release to allow rpc #2922

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
1e07df0
Do not override RELEASE_DISTRIBUTION in release to allow rpc
jonatanklosko Jan 30, 2025
e2d4463
Apply suggestions from code review
jonatanklosko Jan 30, 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 rel/app/env.bat.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if exist "!USERPROFILE!\.livebookdesktop.bat" (
)

set RELEASE_MODE=interactive
set RELEASE_DISTRIBUTION=none
if not defined RELEASE_DISTRIBUTION set RELEASE_DISTRIBUTION=none

set vendor_dir=!RELEASE_ROOT!\vendor\livebook-!RELEASE_VSN!
set MIX_ARCHIVES=!vendor_dir!\archives
Expand Down
2 changes: 1 addition & 1 deletion rel/app/env.sh.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if [ -f "$HOME/.livebookdesktop.sh" ]; then
fi

export RELEASE_MODE="interactive"
export RELEASE_DISTRIBUTION="none"
if [ -z "${RELEASE_DISTRIBUTION}" ]; then export RELEASE_DISTRIBUTION="none"; fi

vendor_dir="${RELEASE_ROOT}/vendor/livebook-${RELEASE_VSN}"
export MIX_ARCHIVES="${vendor_dir}/archives"
Expand Down
2 changes: 1 addition & 1 deletion rel/server/env.bat.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if exist "!RELEASE_ROOT!\user\env.bat" (
)

set RELEASE_MODE=interactive
set RELEASE_DISTRIBUTION=none
if not defined RELEASE_DISTRIBUTION set RELEASE_DISTRIBUTION=none

if defined LIVEBOOK_NODE set RELEASE_NODE=!LIVEBOOK_NODE!
if defined LIVEBOOK_COOKIE set RELEASE_COOKIE=!LIVEBOOK_COOKIE!
Expand Down
2 changes: 1 addition & 1 deletion rel/server/env.sh.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if [ -f "${RELEASE_ROOT}/user/env.sh" ]; then
fi

export RELEASE_MODE="interactive"
export RELEASE_DISTRIBUTION="none"
if [ -z "${RELEASE_DISTRIBUTION}" ]; then export RELEASE_DISTRIBUTION="none"; fi

# Mirror these values, so that it is easier to use "bin/release rpc",
# though it still requires setting RELEASE_DISTRIBUTION=name
Expand Down
Loading