Skip to content

Commit d4ec6f3

Browse files
committed
Tweak Actions to use -O0 in Mac runner.
Use no optimizations inside Mac runners until we figure out the issue with ASan that is happening in that setup.
1 parent 3c7ea90 commit d4ec6f3

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.github/actions/ngen-build/action.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ runs:
194194
# which causes cmake configuration to fail.
195195
run: |
196196
export BOOST_ROOT="$(pwd)/boost_1_86_0"
197-
export CFLAGS="-fsanitize=address -O1 -g -fno-omit-frame-pointer -Werror"
198-
export CXXFLAGS="-fsanitize=address -O1 -g -fno-omit-frame-pointer -pedantic-errors -Werror -Wpessimizing-move -Wparentheses -Wrange-loop-construct -Wsuggest-override"
197+
export CFLAGS="-fsanitize=address -g -fno-omit-frame-pointer -Werror"
198+
export CXXFLAGS="-fsanitize=address -g -fno-omit-frame-pointer -pedantic-errors -Werror -Wpessimizing-move -Wparentheses -Wrange-loop-construct -Wsuggest-override"
199199
if [ ${{ runner.os }} == 'macOS' ]
200200
then
201201
echo "fun:PyType_FromMetaclass" > /tmp/asan_ignore.txt
202-
export CFLAGS="$CFLAGS -fsanitize-ignorelist=/tmp/asan_ignore.txt -fno-common"
203-
export CXXFLAGS="$CXXFLAGS -fsanitize-ignorelist=/tmp/asan_ignore.txt -fno-common"
202+
export CFLAGS="$CFLAGS -O0 -fsanitize-ignorelist=/tmp/asan_ignore.txt -fno-common"
203+
export CXXFLAGS="$CXXFLAGS -O0 -fsanitize-ignorelist=/tmp/asan_ignore.txt -fno-common"
204+
else
205+
export CFLAGS="$CFLAGS -O1"
206+
export CXXFLAGS="$CXXFLAGS -O1"
204207
fi
205208
. .venv/bin/activate
206209
[ ! -d "$BOOST_ROOT" ] && echo "Error: no Boost root found at $BOOST_ROOT" && exit 1

.github/actions/ngen-submod-build/action.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,14 @@ runs:
5050
- name: Cmake Initialization
5151
id: cmake_init
5252
run: |
53-
echo CFLAGS="-fsanitize=address -O1 -g -fno-omit-frame-pointer -Werror" >> $GITHUB_ENV
54-
echo CXXFLAGS="-fsanitize=address -O1 -g -fno-omit-frame-pointer -pedantic-errors -Werror -Wpessimizing-move -Wparentheses -Wrange-loop-construct -Wsuggest-override" >> $GITHUB_ENV
53+
if [ ${{ runner.os }} == 'macOS' ]
54+
then
55+
export OPT_LEVEL_FLAG="-O0"
56+
else
57+
export OPT_LEVEL_FLAG="-O1"
58+
fi
59+
echo CFLAGS="-fsanitize=address ${OPT_LEVEL_FLAG:?Optimization flag var not set} -g -fno-omit-frame-pointer -Werror" >> $GITHUB_ENV
60+
echo CXXFLAGS="-fsanitize=address ${OPT_LEVEL_FLAG:?Optimization flag var not set} -g -fno-omit-frame-pointer -pedantic-errors -Werror -Wpessimizing-move -Wparentheses -Wrange-loop-construct -Wsuggest-override" >> $GITHUB_ENV
5561
cmake -B ${{ inputs.mod-dir}}/${{ inputs.build-dir }} -S ${{ inputs.mod-dir }} ${{ inputs.cmake-flags }}
5662
echo "build-dir=$(echo ${{ inputs.mod-dir}}/${{ inputs.build-dir }})" >> $GITHUB_OUTPUT
5763
shell: bash

0 commit comments

Comments
 (0)