mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

(cherry picked from commit 6d5a911707)
This commit is contained in:
Yossi Gottlieb 2021-10-17 00:07:27 +03:00 committed by Oran Agra
parent 052e01e75d
commit 52cccfbe94
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/daily.yml vendored
View File

@ -247,7 +247,7 @@ jobs:
run: ./runtest-cluster
test-freebsd:
runs-on: macos-10.15
runs-on: macos-12
if: github.repository == 'redis/redis'
timeout-minutes: 14400
steps:

5
tests/modules/Makefile
View File

@ -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