Skip to content

Commit 0fddfe8

Browse files
authored
Use only one compiler per build (msgpack#8)
1 parent 7881431 commit 0fddfe8

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

.github/workflows/gha.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,57 +131,59 @@ jobs:
131131
132132
case ${{ matrix.pattern }} in
133133
0)
134+
export CXX="clang++-10"
134135
export MSGPACK_CXX_VERSION="MSGPACK_CXX11=OFF"
135136
;;
136137
1)
138+
export CXX="g++-10"
137139
export MSGPACK_CXX_VERSION="MSGPACK_CXX11=ON"
138140
;;
139141
2)
142+
export CXX="clang++-10"
140143
export MSGPACK_CXX_VERSION="MSGPACK_CXX14=ON"
141144
;;
142145
3)
146+
export CXX="g++-10"
143147
export MSGPACK_CXX_VERSION="MSGPACK_CXX17=ON"
144148
;;
145149
4)
150+
export CXX="clang++-10"
146151
export MSGPACK_CXX_VERSION="MSGPACK_CXX20=ON"
147152
;;
148153
5)
154+
export CXX="g++-10"
149155
export ARCH=32
150156
;;
151157
6)
158+
export CXX="clang++-10"
152159
export API_VERSION=2
153160
;;
154161
7)
162+
export CXX="g++-10"
155163
export API_VERSION=1
156164
;;
157165
8)
166+
export CXX="clang++-10"
158167
export CHAR_SIGN="unsigned"
159168
;;
160169
9)
170+
export CXX="g++-10"
161171
export X3_PARSE="ON"
162172
;;
163173
10)
174+
export CXX="clang++-10"
164175
export ACTION="ci/build_regression.sh"
165176
;;
166177
11)
178+
export CXX="g++-10"
167179
export ARCH=32
168180
export CHAR_SIGN="unsigned"
169181
export X3_PARSE="ON"
170182
;;
171183
esac
172184
173185
# build and test
174-
175-
# g++
176-
export CXX="g++-10"
177186
CMAKE_CXX_COMPILER="$CXX" CXXFLAGS="-Werror -g ${SANITIZE}" ci/build_cmake.sh || exit 1
178-
179-
# clang++
180-
# with ubsan clang inserts undefined reference to `__mulodi4' on 32-bit build - skip this configuration
181-
if ! [[ $SANITIZE != "" && $ARCH -eq 32 ]]; then
182-
export CXX="clang++-10"
183-
CMAKE_CXX_COMPILER="$CXX" CXXFLAGS="-Werror -g ${SANITIZE}" ci/build_cmake.sh || exit 1
184-
fi
185187
cat Files.cmake| grep ".*\.[h|hpp]" | perl -pe 's/ //g' | sort > tmp1 && find include -name "*.h" -o -name "*.hpp" | sort > tmp2 && diff tmp1 tmp2
186188
187189
windows:

0 commit comments

Comments
 (0)