From e89e7b831590c3052abb9904cb936ddb4101dc5e Mon Sep 17 00:00:00 2001 From: Wojtek Mach Date: Sun, 7 Jul 2024 13:39:44 +0200 Subject: [PATCH 1/2] Update to Elixir 1.17.2 --- rel/app/overlays/bin/app.bat | 209 ----------------------------------- versions | 2 +- 2 files changed, 1 insertion(+), 210 deletions(-) delete mode 100644 rel/app/overlays/bin/app.bat diff --git a/rel/app/overlays/bin/app.bat b/rel/app/overlays/bin/app.bat deleted file mode 100644 index 39b0abe36c7..00000000000 --- a/rel/app/overlays/bin/app.bat +++ /dev/null @@ -1,209 +0,0 @@ -@echo off -REM TODO: remove this file when using Elixir v1.18 (https://github.com/elixir-lang/elixir/pull/13679) -setlocal enabledelayedexpansion - -pushd . -cd "%~dp0\.." -set RELEASE_ROOT=%cd% -popd - -if not defined RELEASE_NAME (set RELEASE_NAME=livebook) -if not defined RELEASE_VSN (for /f "tokens=1,2" %%K in ('type "!RELEASE_ROOT!\releases\start_erl.data"') do (set ERTS_VSN=%%K) && (set RELEASE_VSN=%%L)) -if not defined RELEASE_PROG (set RELEASE_PROG=%~nx0) -set RELEASE_COMMAND=%~1 -set REL_VSN_DIR=!RELEASE_ROOT!\releases\!RELEASE_VSN! -call "!REL_VSN_DIR!\env.bat" %* - -if not defined RELEASE_COOKIE (set /p RELEASE_COOKIE=nul 2>&1 && ( - set DEFAULT_SYS_CONFIG=!RELEASE_SYS_CONFIG! - for /f "skip=1" %%X in ('wmic os get localdatetime') do if not defined TIMESTAMP set TIMESTAMP=%%X - set RELEASE_SYS_CONFIG=!RELEASE_TMP!\!RELEASE_NAME!-!RELEASE_VSN!-!TIMESTAMP:~0,11!-!RANDOM!.runtime - mkdir "!RELEASE_TMP!" >nul 2>&1 - copy /y "!DEFAULT_SYS_CONFIG!.config" "!RELEASE_SYS_CONFIG!.config" >nul || ( - echo Cannot start release because it could not write to "!RELEASE_SYS_CONFIG!.config" - goto end - ) - ) - - goto !REL_GOTO! -) - -if "%~1" == "remote" (goto remote) -if "%~1" == "version" (goto version) -if "%~1" == "stop" (set "REL_RPC=System.stop()" && goto rpc) -if "%~1" == "restart" (set "REL_RPC=System.restart()" && goto rpc) -if "%~1" == "pid" (set "REL_RPC=IO.puts(System.pid())" && goto rpc) -if "%~1" == "rpc" ( - if "%~2" == "" ( - echo ERROR: RPC expects an expression as argument - exit /B 1 - ) - set "REL_RPC=%~2" - goto rpc -) - -echo Usage: %~nx0 COMMAND [ARGS] -echo. -echo The known commands are: -echo. -echo start Starts the system -echo start_iex Starts the system with IEx attached -echo install Installs this system as a Windows service -echo eval "EXPR" Executes the given expression on a new, non-booted system -echo rpc "EXPR" Executes the given expression remotely on the running system -echo remote Connects to the running system via a remote shell -echo restart Restarts the running system via a remote command -echo stop Stops the running system via a remote command -echo pid Prints the operating system PID of the running system via a remote command -echo version Prints the release name and version to be booted -echo. -if not "%~1" == "" ( - echo ERROR: Unknown command %~1 - exit /B 1 -) -goto end - -:start -if "!RELEASE_DISTRIBUTION!" == "none" ( - set RELEASE_DISTRIBUTION_FLAG= -) else ( - set RELEASE_DISTRIBUTION_FLAG=--!RELEASE_DISTRIBUTION! "!RELEASE_NODE!" -) - -"!REL_VSN_DIR!\!REL_EXEC!.bat" !REL_EXTRA! ^ - --cookie "!RELEASE_COOKIE!" ^ - !RELEASE_DISTRIBUTION_FLAG! ^ - --erl "-mode !RELEASE_MODE!" ^ - --erl-config "!RELEASE_SYS_CONFIG!" ^ - --boot "!REL_VSN_DIR!\!RELEASE_BOOT_SCRIPT!" ^ - --boot-var RELEASE_LIB "!RELEASE_ROOT!\lib" ^ - --vm-args "!RELEASE_VM_ARGS!" -goto end - -:eval -set EVAL=%~2 -shift -:loop -shift -if not "%1"=="" ( - set args=%args% %1 - goto :loop -) -"!REL_VSN_DIR!\elixir.bat" ^ - --eval "!EVAL!" ^ - --cookie "!RELEASE_COOKIE!" ^ - --erl-config "!RELEASE_SYS_CONFIG!" ^ - --boot "!REL_VSN_DIR!\!RELEASE_BOOT_SCRIPT_CLEAN!" ^ - --boot-var RELEASE_LIB "!RELEASE_ROOT!\lib" ^ - --vm-args "!RELEASE_VM_ARGS!" -- %args% -goto end - -:remote -if "!RELEASE_DISTRIBUTION!" == "none" ( - set RELEASE_DISTRIBUTION_FLAG= -) else ( - set RELEASE_DISTRIBUTION_FLAG=--!RELEASE_DISTRIBUTION! "rem-!RANDOM!-!RELEASE_NODE!" -) - -"!REL_VSN_DIR!\iex.bat" ^ - --hidden --cookie "!RELEASE_COOKIE!" ^ - !RELEASE_DISTRIBUTION_FLAG! ^ - --boot "!REL_VSN_DIR!\!RELEASE_BOOT_SCRIPT_CLEAN!" ^ - --boot-var RELEASE_LIB "!RELEASE_ROOT!\lib" ^ - --vm-args "!RELEASE_REMOTE_VM_ARGS!" ^ - --remsh "!RELEASE_NODE!" -goto end - -:rpc -if "!RELEASE_DISTRIBUTION!" == "none" ( - set RELEASE_DISTRIBUTION_FLAG= -) else ( - set RELEASE_DISTRIBUTION_FLAG=--!RELEASE_DISTRIBUTION! "rpc-!RANDOM!-!RELEASE_NODE!" -) - -"!REL_VSN_DIR!\elixir.bat" ^ - --hidden --cookie "!RELEASE_COOKIE!" ^ - !RELEASE_DISTRIBUTION_FLAG! ^ - --boot "!REL_VSN_DIR!\!RELEASE_BOOT_SCRIPT_CLEAN!" ^ - --boot-var RELEASE_LIB "!RELEASE_ROOT!\lib" ^ - --vm-args "!RELEASE_REMOTE_VM_ARGS!" ^ - --rpc-eval "!RELEASE_NODE!" "!REL_RPC!" -goto end - -:version -echo !RELEASE_NAME! !RELEASE_VSN! -goto end - -:install -if exist !RELEASE_ROOT!\erts-!ERTS_VSN! ( - set ERLSRV=!RELEASE_ROOT!\erts-!ERTS_VSN!\bin\erlsrv.exe -) else ( - set ERLSRV=erlsrv.exe -) - -if "!RELEASE_DISTRIBUTION!" == "none" ( - echo ERROR: RELEASE_DISTRIBUTION is required in install command - exit /B 1 -) - -"!ERLSRV!" add "!RELEASE_NAME!_!RELEASE_NAME!" ^ - -!RELEASE_DISTRIBUTION! "!RELEASE_NODE!" ^ - -env RELEASE_ROOT="!RELEASE_ROOT!" -env RELEASE_NAME="!RELEASE_NAME!" -env RELEASE_VSN="!RELEASE_VSN!" -env RELEASE_MODE="!RELEASE_MODE!" -env RELEASE_COOKIE="!RELEASE_COOKIE!" -env RELEASE_NODE="!RELEASE_NODE!" -env RELEASE_VM_ARGS="!RELEASE_VM_ARGS!" -env RELEASE_TMP="!RELEASE_TMP!" -env RELEASE_SYS_CONFIG="!RELEASE_SYS_CONFIG!" ^ - -args "-setcookie !RELEASE_COOKIE! -config ""!RELEASE_SYS_CONFIG!"" -mode !RELEASE_MODE! -boot ""!REL_VSN_DIR!\start"" -boot_var RELEASE_LIB ""!RELEASE_ROOT!\lib"" -args_file ""!REL_VSN_DIR!\vm.args""" -if %ERRORLEVEL% EQU 0 ( - echo Service installed but not started. From now on, it must be started and stopped by erlsrv: - echo. - echo !ERLSRV! start !RELEASE_NAME!_!RELEASE_NAME! - echo !ERLSRV! stop !RELEASE_NAME!_!RELEASE_NAME! - echo !ERLSRV! remove !RELEASE_NAME!_!RELEASE_NAME! - echo !ERLSRV! list - echo !ERLSRV! help - echo. -) -goto end - -:end -endlocal diff --git a/versions b/versions index 80e12cdec97..ca7e281b967 100644 --- a/versions +++ b/versions @@ -1,4 +1,4 @@ -elixir="1.17.1" +elixir="1.17.2" otp="27.0" openssl="1.1.1s" rebar3="3.22.0" From 0e642dc43a57bda0302441615c4de88625908bd6 Mon Sep 17 00:00:00 2001 From: Wojtek Mach Date: Sun, 7 Jul 2024 13:42:54 +0200 Subject: [PATCH 2/2] up --- versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions b/versions index ca7e281b967..bc1aa28dd04 100644 --- a/versions +++ b/versions @@ -2,5 +2,5 @@ elixir="1.17.2" otp="27.0" openssl="1.1.1s" rebar3="3.22.0" -debian="bookworm-20240612-slim" +debian="bookworm-20240701-slim" ubuntu="focal-20240530"