File tree Expand file tree Collapse file tree 3 files changed +7
-19
lines changed Expand file tree Collapse file tree 3 files changed +7
-19
lines changed Original file line number Diff line number Diff line change @@ -26,12 +26,10 @@ jobs:
26
26
cd analysis
27
27
# git checkout converted these to windows newline. Convert back to unix newline here
28
28
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
32
30
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
35
33
echo "make now===="
36
34
& $env:CYGWIN_ROOT\\bin\\ocaml-env exec -- make test
37
35
artifact-folder : win32
Original file line number Diff line number Diff line change @@ -37,8 +37,8 @@ tests/node_modules/.bin/rescript:
37
37
38
38
test : dce tests/node_modules/.bin/rescript
39
39
@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
42
42
./test.sh
43
43
44
44
clean :
Original file line number Diff line number Diff line change @@ -2,8 +2,8 @@ function exp {
2
2
echo " $( dirname $1 ) /expected/$( basename $1 ) .txt"
3
3
}
4
4
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
7
7
echo " done---------"
8
8
9
9
# node ./checkErrors.js
@@ -16,26 +16,16 @@ for file in tests/src/*.{res,resi}; do
16
16
# fi
17
17
done
18
18
19
- echo " cat -A test.sh second time"
20
- cat -A tests/src/expected/Auto.res.txt
21
- echo " done 2---------"
22
-
23
19
warningYellow=' \033[0;33m'
24
20
successGreen=' \033[0;32m'
25
21
reset=' \033[0m'
26
22
27
23
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---------"
31
24
if [[ $diff = " " ]]; then
32
25
printf " ${successGreen} ✅ No unstaged tests difference.${reset} \n"
33
26
else
34
27
printf " ${warningYellow} ⚠️ There are unstaged differences in tests/! Did you break a test?\n${diff} \n${reset} "
35
28
# node ./checkErrors.js
36
29
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---------"
40
30
exit 1
41
31
fi
You can’t perform that action at this time.
0 commit comments