Skip to content

Commit 3704f49

Browse files
committed
Git diff everywhere
1 parent 4bfc215 commit 3704f49

File tree

3 files changed

+7
-19
lines changed

3 files changed

+7
-19
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,10 @@ jobs:
2626
cd analysis
2727
# git checkout converted these to windows newline. Convert back to unix newline here
2828
echo "git diff now"
29-
git diff
30-
echo "cat -A ci===="
31-
cat -A tests/src/expected/Auto.res.txt
29+
git diff tests/src/expected/Auto.res.txt
3230
dos2unix test.sh tests/src/*.res tests/src/*.resi
33-
echo "cat -A ci second time===="
34-
cat -A tests/src/expected/Auto.res.txt
31+
echo "git diff again"
32+
git diff tests/src/expected/Auto.res.txt
3533
echo "make now===="
3634
& $env:CYGWIN_ROOT\\bin\\ocaml-env exec -- make test
3735
artifact-folder: win32

analysis/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ tests/node_modules/.bin/rescript:
3737

3838
test: dce tests/node_modules/.bin/rescript
3939
@cd tests && node_modules/.bin/rescript
40-
@echo "cat -A makefile test======"
41-
cat -A tests/src/expected/Auto.res.txt
40+
@echo "git diff makefile"
41+
git diff tests/src/expected/Auto.res.txt
4242
./test.sh
4343

4444
clean:

analysis/test.sh

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ function exp {
22
echo "$(dirname $1)/expected/$(basename $1).txt"
33
}
44

5-
echo "cat -A test.sh"
6-
cat -A tests/src/expected/Auto.res.txt
5+
echo "git diff test.sh"
6+
git diff tests/src/expected/Auto.res.txt
77
echo "done---------"
88

99
# node ./checkErrors.js
@@ -16,26 +16,16 @@ for file in tests/src/*.{res,resi}; do
1616
# fi
1717
done
1818

19-
echo "cat -A test.sh second time"
20-
cat -A tests/src/expected/Auto.res.txt
21-
echo "done 2---------"
22-
2319
warningYellow='\033[0;33m'
2420
successGreen='\033[0;32m'
2521
reset='\033[0m'
2622

2723
diff=$(git ls-files --modified tests/src/expected)
28-
echo "cat -A test.sh third time (after ls-files)"
29-
cat -A tests/src/expected/Auto.res.txt
30-
echo "done 3---------"
3124
if [[ $diff = "" ]]; then
3225
printf "${successGreen}✅ No unstaged tests difference.${reset}\n"
3326
else
3427
printf "${warningYellow}⚠️ There are unstaged differences in tests/! Did you break a test?\n${diff}\n${reset}"
3528
# node ./checkErrors.js
3629
git --no-pager diff --word-diff-regex=. tests/src/expected/Auto.res.txt
37-
echo "cat -A test.sh last time (after git diff)"
38-
cat -A tests/src/expected/Auto.res.txt
39-
echo "done 4last---------"
4030
exit 1
4131
fi

0 commit comments

Comments
 (0)