Unverified Commit 6d5a9117 authored by Yossi Gottlieb's avatar Yossi Gottlieb Committed by GitHub
Browse files

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.
parent 3c9e5271
...@@ -399,7 +399,7 @@ jobs: ...@@ -399,7 +399,7 @@ jobs:
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}} run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
test-freebsd: test-freebsd:
runs-on: macos-latest runs-on: macos-10.15
if: github.repository == 'redis/redis' && !contains(github.event.inputs.skipjobs, 'freebsd') if: github.repository == 'redis/redis' && !contains(github.event.inputs.skipjobs, 'freebsd')
timeout-minutes: 14400 timeout-minutes: 14400
steps: steps:
......
...@@ -11,8 +11,9 @@ else # Linux, others ...@@ -11,8 +11,9 @@ else # Linux, others
endif endif
# Needed to satisfy __stack_chk_fail_local on Linux with -m32, due to gcc # 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. # -fstack-protector by default. Breaks on FreeBSD and macOS 11 so needs
ifneq ($(uname_S),FreeBSD) # to be Linux specific.
ifeq ($(uname_S),Linux)
LIBS = -lc LIBS = -lc
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment