From bb9c673d2cf022e75d1d34d2b2dd12a1e41dc6ac Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Mon, 13 Feb 2023 20:04:54 +0100 Subject: ci: automatically maximize MIN_LOG_LEVEL if CI detected (#22248) Detect if on CI by checking that the CI environment variable is set to "true". This is a common pattern among CI providers, including github actions and cirrus. --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index d9b67eafe7..0d58d2bd85 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,7 +1,7 @@ env: CIRRUS_CLONE_DEPTH: '2' LANG: en_US.UTF-8 - CMAKE_EXTRA_FLAGS: -DCI_BUILD=ON -DMIN_LOG_LEVEL=3 + CMAKE_EXTRA_FLAGS: -DCI_BUILD=ON freebsd_task: name: FreeBSD -- cgit From fbb27a101f4fec14dec2f508be86d8688a8bd2d9 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Sat, 18 Feb 2023 00:09:51 +0100 Subject: ci: remove former dependencies that are no longer needed (#22301) libtool, autoconf, automake and perl are no longer dependencies of neovim and doesn't need to be installed in CI anymore. The dependencies and the commit that removed them as dependencies are the following: libtool: b05100a9eaad5980ea7652137bc4a1c2d15d752f perl: 20a932cb72cf077d54e3498ef93341ffe3d4cdbb autoconf+automake: e23c5fda0a3fe385af615372c474d4dad3b74464 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 0d58d2bd85..e4bac2d014 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,7 +11,7 @@ freebsd_task: timeout_in: 30m install_script: - pkg update -f - - pkg install -y cmake gmake ninja libtool automake pkgconf unzip wget gettext python libffi git + - pkg install -y cmake gmake ninja pkgconf unzip wget gettext python libffi git build_deps_script: - gmake deps build_script: -- cgit From 9301abdf748b54fa3d41375cc4659ca9f4b57dd8 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Sat, 18 Feb 2023 17:43:39 +0100 Subject: ci: enable CI_BUILD automatically if environment variable CI is true (#22312) Having to specify CI_BUILD for every CI job requires boilerplate. More importantly, it's easy to forget to enable CI_BUILD, as seen by 8a20f9f98a90a7a43aea08fcde2c40a5356b4f7b. It's simpler to remember to turn CI_BUILD off when a job errors instead of remembering that every new job should have CI_BUILD on. --- .cirrus.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index e4bac2d014..f602a2c1df 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,7 +1,6 @@ env: CIRRUS_CLONE_DEPTH: '2' LANG: en_US.UTF-8 - CMAKE_EXTRA_FLAGS: -DCI_BUILD=ON freebsd_task: name: FreeBSD @@ -15,7 +14,7 @@ freebsd_task: build_deps_script: - gmake deps build_script: - - gmake CMAKE_EXTRA_FLAGS="${CMAKE_EXTRA_FLAGS}" nvim + - gmake nvim workaround_script: # Run tests as user "cirrus" instead of root. This is required for the # permission-related tests to work correctly. -- cgit From d4398f40214fb6175e2bff4c5823e0e6ca13fbda Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Fri, 7 Apr 2023 22:31:04 +0200 Subject: ci: don't automatically enable -Werror on CI environments This catches downstream consumers of neovim off guard when using neovim in an esoteric environment not tested in our own CI. Closes https://github.com/neovim/neovim/issues/22932 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index f602a2c1df..a1264ca608 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,7 +14,7 @@ freebsd_task: build_deps_script: - gmake deps build_script: - - gmake nvim + - gmake CMAKE_EXTRA_FLAGS="-DCI_BUILD=ON" nvim workaround_script: # Run tests as user "cirrus" instead of root. This is required for the # permission-related tests to work correctly. -- cgit From 7d0479c55810af9bf9f115ba69d1419ea81ec41e Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Wed, 26 Apr 2023 23:22:12 +0200 Subject: ci: containerize the external dependencies test Cirrus ci automatically pushes/caches docker images, which makes containerization much simpler to handle. Moving this job to cirrus ci shortens the job by a minute, and reduces github actions CI usage by two minutes per PR. --- .cirrus.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index a1264ca608..92507f6d50 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -26,3 +26,17 @@ freebsd_task: - sudo -u cirrus gmake unittest oldtest_script: - sudo -u cirrus gmake oldtest + +with_external_deps_task: + container: + dockerfile: ci/Dockerfile.external_deps + deps_script: + # Ideally all dependencies should external for this job, but some + # dependencies don't have the required version available. We use the + # bundled versions for these with the hopes of being able to remove them + # later on. + - cmake -S cmake.deps -B .deps -G Ninja -D USE_BUNDLED=OFF -D USE_BUNDLED_LIBVTERM=ON -D USE_BUNDLED_TS=ON + - cmake --build .deps + build_script: + - cmake --preset ci + - cmake --build build -- cgit From 129012172258a08efa87cbab927cdd3e4da7db90 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Sat, 29 Apr 2023 01:48:36 +0200 Subject: build: add CMakePresets for deps build to reduce verbosity --- .cirrus.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 92507f6d50..d9067b05e3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -27,15 +27,11 @@ freebsd_task: oldtest_script: - sudo -u cirrus gmake oldtest -with_external_deps_task: +external_deps_task: container: dockerfile: ci/Dockerfile.external_deps deps_script: - # Ideally all dependencies should external for this job, but some - # dependencies don't have the required version available. We use the - # bundled versions for these with the hopes of being able to remove them - # later on. - - cmake -S cmake.deps -B .deps -G Ninja -D USE_BUNDLED=OFF -D USE_BUNDLED_LIBVTERM=ON -D USE_BUNDLED_TS=ON + - cmake -S cmake.deps --preset external_deps - cmake --build .deps build_script: - cmake --preset ci -- cgit From e7da49d5bf224fcabd02800ae7f800363a32e3d0 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Mon, 1 May 2023 07:39:27 +0200 Subject: ci: don't install unnecessary dependencies --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index d9067b05e3..530095c40f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,7 +10,7 @@ freebsd_task: timeout_in: 30m install_script: - pkg update -f - - pkg install -y cmake gmake ninja pkgconf unzip wget gettext python libffi git + - pkg install -y cmake gmake ninja unzip wget gettext python git build_deps_script: - gmake deps build_script: -- cgit From 165c4c9e57cd342a994201578def2e6aa62a11d7 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 13 Aug 2023 07:34:23 +0800 Subject: vim-patch:cd4e4e169ab3 (#24685) .cirrus.yml: skip pkg update for FreeBSD 13.1 (vim/vim#12767) https://github.com/vim/vim/commit/cd4e4e169ab3ff0b9315e5bc16d5ba490ee251ff Co-authored-by: Philip H <47042125+pheiduck@users.noreply.github.com> --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 530095c40f..76f15852c4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -9,7 +9,6 @@ freebsd_task: image_family: freebsd-13-1 timeout_in: 30m install_script: - - pkg update -f - pkg install -y cmake gmake ninja unzip wget gettext python git build_deps_script: - gmake deps -- cgit From 3bf2839dec09a7a8ad38b164eb06e193c107181a Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Sun, 3 Sep 2023 12:06:32 +0200 Subject: ci: move external_deps job from cirrus-ci back to github actions This partially reverts commit 7d0479c55810af9bf9f115ba69d1419ea81ec41e. The job has been particularly unstable when used with docker on cirrus-ci, which is especially bad as it's meant to be a non-flaky and simple test. --- .cirrus.yml | 10 ---------- 1 file changed, 10 deletions(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 76f15852c4..20e5f0ad76 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -25,13 +25,3 @@ freebsd_task: - sudo -u cirrus gmake unittest oldtest_script: - sudo -u cirrus gmake oldtest - -external_deps_task: - container: - dockerfile: ci/Dockerfile.external_deps - deps_script: - - cmake -S cmake.deps --preset external_deps - - cmake --build .deps - build_script: - - cmake --preset ci - - cmake --build build -- cgit From 4258f4d53cb3d8d0adbaccf410e1bb422db9badb Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 11 Sep 2023 12:41:53 +0800 Subject: ci(cirrus): use FreeBSD 13.2 (#24684) --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 20e5f0ad76..ab4bead7fb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,7 +6,7 @@ freebsd_task: name: FreeBSD only_if: $BRANCH != "master" freebsd_instance: - image_family: freebsd-13-1 + image_family: freebsd-13-2 timeout_in: 30m install_script: - pkg install -y cmake gmake ninja unzip wget gettext python git -- cgit