diff --git a/.cirrus.yml b/.cirrus.yml deleted file mode 100644 index 77d8202..0000000 --- a/.cirrus.yml +++ /dev/null @@ -1,15 +0,0 @@ -task: - - # only test the main branch and pull requests - only_if: $CIRRUS_BRANCH == "main" || $CIRRUS_PR != "" - - matrix: - - - name: FreeBSD - freebsd_instance: - image_family: freebsd-15-0-snap - environment: - CFLAGS: -Werror -g -fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize-recover=undefined - UBSAN_OPTIONS: print_stacktrace=1 - install_script: python3 --version && pkg upgrade -y && pkg install -y cmake py311-pytest vim - test_script: uname -sr && env cmake -B build -S . && cmake --build build && cmake --build build --target check && cmake --install build diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f8c77a..d681488 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,35 @@ on: branches: - main jobs: + freebsd13: + name: FreeBSD + runs-on: ubuntu-24.04 + steps: + - uses: vmactions/freebsd-vm@7ca82f79fe3078fecded6d3a2bff094995447bbd + with: + sync: no + release: "15.0" + usesh: true + run: | + set -e + set -o pipefail + set -u + set -x + uname -rms + pkg install -y cmake git python3 py311-pytest vim + python3 --version + git clone --no-checkout -- ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} wd + cd wd + git fetch -- origin ${{ github.event.pull_request.head.sha }} + git checkout FETCH_HEAD + export CFLAGS="-Werror -g -fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize-recover=address,undefined" + export UBSAN_OPTIONS=print_stacktrace=1 + export TERM=xterm + cmake -B build -S . + cmake --build build + cmake --build build --target check + cmake --install build + linux: name: Linux runs-on: ubuntu-24.04 diff --git a/libvimcat/src/read.c b/libvimcat/src/read.c index 2e3cccc..d364ec9 100644 --- a/libvimcat/src/read.c +++ b/libvimcat/src/read.c @@ -239,7 +239,7 @@ static int run_vim(FILE **out, pid_t *pid, const char *filename, size_t rows, STDERR_FILENO)))) goto done; } else { - DEBUG("leading Vim’s stderr not redirected"); + DEBUG("leaving Vim’s stderr not redirected"); } // construct Vim parameter to force terminal height