From ac5f21d613bf4a4883e767389ac5651a4118a5af Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Wed, 20 Jan 2021 14:07:09 +0200 Subject: [PATCH] Add CI for FreeBSD (#8292) Co-authored-by: Oran Agra --- .github/workflows/ci.yml | 11 +++++++++++ .github/workflows/daily.yml | 17 +++++++++++++++++ src/server.c | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2582c53a4..2e1e7865c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,3 +58,14 @@ jobs: run: | yum -y install gcc make make REDIS_CFLAGS='-Werror' + + build-freebsd: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - name: make + uses: vmactions/freebsd-vm@v0.1.0 + with: + usesh: true + prepare: pkg install -y gmake + run: gmake diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index cfbf24f87..8fb23bac4 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -203,3 +203,20 @@ jobs: - name: cluster tests run: ./runtest-cluster + test-freebsd: + runs-on: macos-latest + if: github.repository == 'redis/redis' + timeout-minutes: 14400 + steps: + - uses: actions/checkout@v2 + - name: test + uses: vmactions/freebsd-vm@v0.1.0 + with: + usesh: true + prepare: pkg install -y gmake lang/tcl85 + run: | + gmake + ./runtest --accurate --verbose --no-latency + MAKE=gmake ./runtest-moduleapi --verbose + ./runtest-sentinel + ./runtest-cluster diff --git a/src/server.c b/src/server.c index 03e448f10..1b8bc0c42 100644 --- a/src/server.c +++ b/src/server.c @@ -4684,7 +4684,7 @@ sds genRedisInfoString(const char *section) { "aof_last_cow_size:%zu\r\n" "module_fork_in_progress:%d\r\n" "module_fork_last_cow_size:%zu\r\n", - server.loading, + (int)server.loading, server.stat_current_cow_bytes, server.dirty, server.child_type == CHILD_TYPE_RDB,