From 317468aaceb48e136ed7e3fa6d233345fd5360c6 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 4 Oct 2023 19:57:35 +0200 Subject: [PATCH] patch 9.0.1979: Cirrus CI disabled Problem: Cirrus CI disabled Solution: re-enable Cirrus CI Ref patch 9.0.1912: > Perhaps at the beginning of the next month we can revisit and enable > just a build without testing it. Hopefully this is won't take too > many credits and we can at least verify that building works. Actually enabling testing should be fine. In the last month there were three Cirrus CI jobs and credits ran out on Sep 15, but now there is only one Cirrus CI job, so credits shouldn't run out. closes: #13261 Signed-off-by: Christian Brabandt Co-authored-by: zeertzjq --- .cirrus.yml | 46 +++++++++++++++++++++++----------------------- src/version.c | 2 ++ 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3f42921ac5..78e49d9805 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,23 +1,23 @@ -#env: -# CIRRUS_CLONE_DEPTH: 3 -# FEATURES: huge -# -#freebsd_task: -# name: FreeBSD -# matrix: -# - name: FreeBSD 14.0 -# freebsd_instance: -# image_family: freebsd-14-0 -# timeout_in: 20m -# install_script: -# - pkg install -y gettext -# build_script: -# - NPROC=$(getconf _NPROCESSORS_ONLN) -# - ./configure --with-features=${FEATURES} -# - make -j${NPROC} -# test_script: -# - src/vim --version -# # run tests as user "cirrus" instead of root -# - pw useradd cirrus -m -# - chown -R cirrus:cirrus . -# - sudo -u cirrus make test +env: + CIRRUS_CLONE_DEPTH: 3 + FEATURES: huge + +freebsd_task: + name: FreeBSD + matrix: + - name: FreeBSD 14.0 + freebsd_instance: + image_family: freebsd-14-0 + timeout_in: 20m + install_script: + - pkg install -y gettext + build_script: + - NPROC=$(getconf _NPROCESSORS_ONLN) + - ./configure --with-features=${FEATURES} + - make -j${NPROC} + test_script: + - src/vim --version + # run tests as user "cirrus" instead of root + - pw useradd cirrus -m + - chown -R cirrus:cirrus . + - sudo -u cirrus make test diff --git a/src/version.c b/src/version.c index 2c99b23849..ba461ba11f 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1979, /**/ 1978, /**/