# HG changeset patch # User Christian Brabandt # Date 1693251005 -7200 # Node ID ee683d311c05697e76724604609652d246584caa # Parent 8a6709a1c219ac1e8cfda1f4c89afa2710f472d5 patch 9.0.1812: CI still fails with sodium_mlock error() Commit: https://github.com/vim/vim/commit/93ebb5e75e564403624314c84c97293427d001d6 Author: Christian Brabandt Date: Mon Aug 28 21:17:36 2023 +0200 patch 9.0.1812: CI still fails with sodium_mlock error() Problem: CI still fails with sodium_mlock error() Solution: Catch and ignore E1230 error in test_crypt closes: #12939 Signed-off-by: Christian Brabandt diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim --- a/src/testdir/test_crypt.vim +++ b/src/testdir/test_crypt.vim @@ -290,7 +290,11 @@ func Test_uncrypt_xchacha20v2_2() " encrypted using xchacha20 call assert_match("\[xchachav2\]", execute(':messages')) bw! - call feedkeys(":verbose :sp Xcrypt_sodium_v2.txt\sodium\", 'xt') + try + call feedkeys(":verbose :sp Xcrypt_sodium_v2.txt\sodium\", 'xt') + catch /^Vim\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI + throw 'Skipped: sodium_mlock() not possible' + endtry " successfully decrypted call assert_equal(range(1, 4000)->map( {_, v -> string(v)}), getline(1,'$')) call assert_match('xchacha20v2: using default \w\+ "\d\+" for Key derivation.', execute(':messages')) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1812, +/**/ 1811, /**/ 1810,