diff options
| author | Yossi Gottlieb <yossigo@gmail.com> | 2021-10-17 00:07:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-17 00:07:27 +0300 |
| commit | 6d5a9117073508ca2bdd71a3932a1badcaab0418 (patch) | |
| tree | 8270dbc48e5e1bdc39ebf0c2092ba6ee44b7cbb8 | |
| parent | 3c9e5271c6762f25af12a0d039dc23a469258ffd (diff) | |
| download | redis-6d5a9117073508ca2bdd71a3932a1badcaab0418.tar.gz | |
Fix daily failures due to macos-latest change. (#9637)
* Fix test modules linking on macOS 11.x.
* Use macOS 10.x for FreeBSD VM as VirtualBox is not yet supported on
11.
| -rw-r--r-- | .github/workflows/daily.yml | 2 | ||||
| -rw-r--r-- | tests/modules/Makefile | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 800016508..95de9d145 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -399,7 +399,7 @@ jobs: run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}} test-freebsd: - runs-on: macos-latest + runs-on: macos-10.15 if: github.repository == 'redis/redis' && !contains(github.event.inputs.skipjobs, 'freebsd') timeout-minutes: 14400 steps: diff --git a/tests/modules/Makefile b/tests/modules/Makefile index 0c797855f..56c25dd18 100644 --- a/tests/modules/Makefile +++ b/tests/modules/Makefile @@ -11,8 +11,9 @@ else # Linux, others endif # Needed to satisfy __stack_chk_fail_local on Linux with -m32, due to gcc -# -fstack-protector by default. Breaks on FreeBSD so we exclude it. -ifneq ($(uname_S),FreeBSD) +# -fstack-protector by default. Breaks on FreeBSD and macOS 11 so needs +# to be Linux specific. +ifeq ($(uname_S),Linux) LIBS = -lc endif |