Patch 9.0.1489

[Bram Moolenaar]

Patch 9.0.1489
Problem: Crypt with libsodium is not tested on CI.
Solution: Configure testing with libsodium. (Ozaki Kiichi, closes #12297)
Files: .github/workflows/ci.yml


*** ../vim-9.0.1488/.github/workflows/ci.yml 2023-04-21 19:51:17.455041775 +0100
--- .github/workflows/ci.yml 2023-04-26 15:40:06.885999994 +0100
***************
*** 370,375 ****
--- 370,381 ----
# Other dependencies
# winpty
WINPTY_URL: https://github.com/rprichard/winpty/releases/download/0.4.3/winpty-0.4.3-msvc2015.zip
+ # libsodium
+ SODIUM_VER: '1.0.18'
+ SODIUM_MSVC_URL: https://download.libsodium.org/libsodium/releases/libsodium-%SODIUM_VER%-stable-msvc.zip
+ SODIUM_MSVC_VER: v143
+ SODIUM_MINGW_URL: https://download.libsodium.org/libsodium/releases/libsodium-%SODIUM_VER%-stable-mingw.tar.gz
+ SODIUM_MINGW_VER: 23
# Escape sequences
COL_RED: "\x1b[31m"
COL_GREEN: "\x1b[32m"
***************
*** 399,405 ****

git config --global core.autocrlf input

! if [ "${{ matrix.arch }}" = "x64" ]; then
cygreg=registry
pyreg=
echo "VCARCH=amd64" >> $GITHUB_ENV
--- 405,411 ----

git config --global core.autocrlf input

! if ${{ matrix.arch == 'x64' }}; then
cygreg=registry
pyreg=
echo "VCARCH=amd64" >> $GITHUB_ENV
***************
*** 416,423 ****
fi

echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
! if [ "${{ matrix.features }}" != "TINY" ]; then
! if [ "${{ matrix.arch }}" = "x86" ]; then
choco install python2 --no-progress --forcex86
else
choco install python2 --no-progress
--- 422,429 ----
fi

echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
! if ${{ matrix.features != 'TINY' }}; then
! if ${{ matrix.arch == 'x86' }}; then
choco install python2 --no-progress --forcex86
else
choco install python2 --no-progress
***************
*** 426,431 ****
--- 432,446 ----
python3_dir=$(cat "/proc/$cygreg/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}$pyreg/InstallPath/@")
echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV

+ if ${{ matrix.toolchain == 'msvc' }}; then
+ SODIUM_DIR=D:\\libsodium
+ echo "SODIUM_LIB=${SODIUM_DIR}\\${{ matrix.arch == 'x64' && 'x64' || 'Win32' }}\\Release\\${SODIUM_MSVC_VER}\\dynamic" >> $GITHUB_ENV
+ else
+ SODIUM_DIR=D:\\libsodium-win${{ matrix.arch == 'x64' && '64' || '32' }}
+ echo "SODIUM_LIB=${SODIUM_DIR}\\bin" >> $GITHUB_ENV
+ fi
+ echo "SODIUM_DIR=${SODIUM_DIR}" >> $GITHUB_ENV
+
- uses: msys2/setup-msys2@v2
if: matrix.toolchain == 'mingw'
with:
***************
*** 445,450 ****
--- 460,466 ----
type NUL > urls.txt
echo %LUA_RELEASE%>> urls.txt
echo %WINPTY_URL%>> urls.txt
+ echo %SODIUM_VER%>> urls.txt

- name: Cache downloaded files
uses: actions/cache@v3
***************
*** 468,473 ****
--- 484,499 ----
copy /Y D:\winpty\%WARCH%\bin\winpty.dll src\winpty%BITS%.dll
copy /Y D:\winpty\%WARCH%\bin\winpty-agent.exe src\

+ echo %COL_GREEN%Download libsodium%COL_RESET%
+ if "${{ matrix.toolchain }}"=="msvc" (
+ call :downloadfile %SODIUM_MSVC_URL% downloads\libsodium.zip
+ 7z x -y downloads\libsodium.zip -oD:\ > nul || exit 1
+ ) else (
+ call :downloadfile %SODIUM_MINGW_URL% downloads\libsodium.tar.gz
+ 7z x -y downloads\libsodium.tar.gz -so | 7z x -si -ttar -oD:\ > nul || exit 1
+ mklink %SODIUM_LIB%\libsodium.dll %SODIUM_LIB%\libsodium-%SODIUM_MINGW_VER%.dll
+ )
+
goto :eof

:downloadfile
***************
*** 498,504 ****
GUI=%GUI% IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} ^
DYNAMIC_LUA=yes LUA=%LUA_DIR% ^
DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^
! DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR%
) else (
nmake -nologo -f Make_mvc.mak ^
FEATURES=${{ matrix.features }} ^
--- 524,531 ----
GUI=%GUI% IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} ^
DYNAMIC_LUA=yes LUA=%LUA_DIR% ^
DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^
! DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^
! DYNAMIC_SODIUM=yes SODIUM=%SODIUM_DIR%
) else (
nmake -nologo -f Make_mvc.mak ^
FEATURES=${{ matrix.features }} ^
***************
*** 522,527 ****
--- 549,555 ----
DYNAMIC_LUA=yes LUA=${LUA_DIR_SLASH} \
DYNAMIC_PYTHON=yes PYTHON=${PYTHON_DIR} \
DYNAMIC_PYTHON3=yes PYTHON3=${PYTHON3_DIR} \
+ DYNAMIC_SODIUM=yes SODIUM=${SODIUM_DIR} \
STATIC_STDCPLUS=yes COVERAGE=${{ matrix.coverage }}
else
mingw32-make -f Make_ming.mak -j2 \
***************
*** 566,572 ****
shell: cmd
timeout-minutes: 15
run: |
! PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%
call "%VCVARSALL%" %VCARCH%

echo %COL_GREEN%Test gVim:%COL_RESET%
--- 594,600 ----
shell: cmd
timeout-minutes: 15
run: |
! PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%;%SODIUM_LIB%
call "%VCVARSALL%" %VCARCH%

echo %COL_GREEN%Test gVim:%COL_RESET%
***************
*** 583,589 ****
shell: cmd
timeout-minutes: 15
run: |
! PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%
call "%VCVARSALL%" %VCARCH%

echo %COL_GREEN%Test Vim:%COL_RESET%
--- 611,617 ----
shell: cmd
timeout-minutes: 15
run: |
! PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%;%SODIUM_LIB%
call "%VCVARSALL%" %VCARCH%

echo %COL_GREEN%Test Vim:%COL_RESET%
*** ../vim-9.0.1488/src/version.c 2023-04-25 15:27:23.355582228 +0100
--- src/version.c 2023-04-26 15:41:25.494035938 +0100
***************
*** 697,698 ****
--- 697,700 ----
{ /* Add new patch number below this line */
+ /**/
+ 1489,
/**/

--
CART DRIVER: Bring out your dead!
There are legs stick out of windows and doors. Two MEN are fighting in the
mud - covered from head to foot in it. Another MAN is on his hands in
knees shovelling mud into his mouth. We just catch sight of a MAN falling
into a well.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///