Skip to content

Commit 68cf370

Browse files
[re-land] Use -Werror (with some exceptions) on Windows builds (#496)
Re-land #484 (as requested in #487 (comment)) This will need the treehashes to be signed again. --------- Co-authored-by: Ian Butterworth <[email protected]>
1 parent 0b91eca commit 68cf370

File tree

7 files changed

+13
-8
lines changed

7 files changed

+13
-8
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
Salted__����G4�~�{���C8c�7�}!4U�Y�q��/ 1:�ve�e��v�3���Q
2-
�R�[)�Vd��!���12�p�����fG�^�ͣ�*
1+
Salted__>|��k�'����P����/+h����W��{K��+JM�`;{�L�q�+"Y���~{_��Չ���-�77���enؼiOU�%�
0 Bytes
Binary file not shown.

pipelines/main/platforms/build_windows.arches

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# OS TRIPLET ARCH DOCKER_ARCH MAKE_FLAGS TIMEOUT DOCKER_TAG
2-
windows x86_64-w64-mingw32 x86_64 x86_64 VERBOSE=1 . v7.10
3-
windows i686-w64-mingw32 x86_64 i686 VERBOSE=1 . v7.10
1+
# OS TRIPLET ARCH DOCKER_ARCH MAKE_FLAGS TIMEOUT DOCKER_TAG
2+
windows x86_64-w64-mingw32 x86_64 x86_64 VERBOSE=1,JL_CFLAGS="-Werror -Wno-error=array-bounds -Wno-error=array-bounds= -Wno-error=infinite-recursion",JL_CXXFLAGS="-Werror -Wno-error=array-bounds -Wno-error=array-bounds= -Wno-error=infinite-recursion" . v7.10
3+
windows i686-w64-mingw32 x86_64 i686 VERBOSE=1,JL_CFLAGS="-Werror -Wno-error=array-bounds -Wno-error=array-bounds= -Wno-error=infinite-recursion",JL_CXXFLAGS="-Werror -Wno-error=array-bounds -Wno-error=array-bounds= -Wno-error=infinite-recursion" . v7.10
44

55
# These special lines allow us to embed default values for the columns above.
66
# Any column without a default mapping here will simply substitute a `.` to the empty string
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Salted__�n�H���~��;gFyi���κ�1��*k��qE���Ѽ��I��/��7��uN߀��Bރ�Z�Dd6�r$57a���]/?�]�
1+
Salted__��I�e�¡�F_k�m� A0�wcQu���1Ӏ$���&��]$�hۗ6�v�#�"b�)x�6��%4n����~�6]��u4C�TqZa

utilities/arches_env.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515

1616
enforce_sanitized() {
1717
for value in "$@"; do
18-
if ! [[ "${value}" =~ ^[a-zA-Z0-9_\.[:space:]=,-]*$ ]]; then
18+
if ! [[ "${value}" =~ ^[a-zA-Z0-9_\.\"+[:space:]=,-]*$ ]]; then
1919
echo "Arches file '${ARCHES_FILE}' contains value '${value}' with non-alphanumeric characters; refusing to parse!" >&2
2020
exit 1
2121
fi
@@ -54,7 +54,13 @@ while read -r line; do
5454
enforce_sanitized "${line}"
5555

5656
# Convert line to array
57-
readarray -d ' ' -t line_array <<<"${line}"
57+
{
58+
set -f
59+
# shellcheck disable=SC2207
60+
# `read -a` ignores quoted strings when splitting and we are controlling word
61+
# splitting via IFS and `set -f` as ShellCheck recommends
62+
IFS=$'\n' line_array=( $(xargs -n1 <<<"${line}") )
63+
}
5864

5965
# Panic if we don't have the same number of items as our column names:
6066
if [[ "${#line_array[@]}" != "${#var_names[@]}" ]]; then

0 commit comments

Comments
 (0)