Skip to content

Commit 74932cc

Browse files
authored
Use gsed on MacOS CI (#1875)
* Use gsed on MacOS CI * Update github-actions-make.sh
1 parent 3ca0d52 commit 74932cc

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

etc/ci/github-actions-make.sh

+18-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,22 @@ if [ ! -z "${reportify}" ]; then
2424
reportify="COQC=$(pwd)/etc/coq-scripts/github/reportify-coq.sh${reportify} ${COQBIN}coqc"
2525
fi
2626

27+
if [ -z "${SED+x}" ]; then
28+
# use gsed on macOS
29+
if command -v gsed >/dev/null 2>&1; then
30+
SED=gsed
31+
else
32+
SED=sed
33+
fi
34+
fi
35+
36+
if [ -z "${SED_Z}" ]; then
37+
SED_Z="${SED} -z"
38+
fi
39+
40+
export SED
41+
export SED_Z
42+
2743
make_one_time_file_real=""
2844
unameOut="$(uname -s)"
2945
if [[ "${unameOut}" == CYGWIN* ]]; then
@@ -53,15 +69,15 @@ fi
5369
unameOut="$(uname -s)"
5470
if [[ "${unameOut}" == CYGWIN* ]]; then
5571
# generated build outputs have a different path, so we fix up the paths
56-
git grep --name-only 'D:\\a\\fiat-crypto\\fiat-crypto.src.ExtractionOCaml.' | xargs sed s',D:\\a\\fiat-crypto\\fiat-crypto.src.ExtractionOCaml.\(.*\).exe,src/ExtractionOCaml/\1,g' -i
72+
git grep --name-only 'D:\\a\\fiat-crypto\\fiat-crypto.src.ExtractionOCaml.' | xargs ${SED} s',D:\\a\\fiat-crypto\\fiat-crypto.src.ExtractionOCaml.\(.*\).exe,src/ExtractionOCaml/\1,g' -i
5773
fi
5874

5975
if [ ! -z "$(git diff)" ]; then
6076
git submodule foreach --recursive git diff
6177
git submodule foreach --recursive git status
6278
git diff
6379
diff_msg="$(git diff 2>&1; git submodule foreach --recursive git diff 2>&1; git submodule foreach --recursive git status 2>&1)"
64-
diff_msg="$(printf "Non-empty-diff:\n%s\n" "${diff_msg}" | sed -z 's/\n/%0A/g')"
80+
diff_msg="$(printf "Non-empty-diff:\n%s\n" "${diff_msg}" | ${SED_Z} 's/\n/%0A/g')"
6581
if [ "${ALLOW_DIFF}" != "1" ]; then
6682
printf "::error::%s" "${diff_msg}"
6783
exit 1

0 commit comments

Comments
 (0)