Remove shfmt
We don't have that many scripts and for the amount of errors this is causing on a weekly basis for contributors its not worth the overhead. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
parent
3a5b963f2f
commit
5930d5b427
|
@ -47,15 +47,6 @@ RUN mkdir -p /usr/src/criu \
|
||||||
&& make install-criu \
|
&& make install-criu \
|
||||||
&& rm -rf /usr/src/criu
|
&& rm -rf /usr/src/criu
|
||||||
|
|
||||||
# install shfmt
|
|
||||||
RUN mkdir -p /go/src/github.com/mvdan \
|
|
||||||
&& cd /go/src/github.com/mvdan \
|
|
||||||
&& git clone https://github.com/mvdan/sh \
|
|
||||||
&& cd sh \
|
|
||||||
&& git checkout -f v0.4.0 \
|
|
||||||
&& go install ./cmd/shfmt \
|
|
||||||
&& rm -rf /go/src/github.com/mvdan
|
|
||||||
|
|
||||||
# setup a playground for us to spawn containers in
|
# setup a playground for us to spawn containers in
|
||||||
ENV ROOTFS /busybox
|
ENV ROOTFS /busybox
|
||||||
RUN mkdir -p ${ROOTFS} \
|
RUN mkdir -p ${ROOTFS} \
|
||||||
|
|
1
Makefile
1
Makefile
|
@ -133,7 +133,6 @@ clean:
|
||||||
|
|
||||||
validate:
|
validate:
|
||||||
script/validate-gofmt
|
script/validate-gofmt
|
||||||
script/validate-shfmt
|
|
||||||
go vet $(allpackages)
|
go vet $(allpackages)
|
||||||
|
|
||||||
ci: validate localtest
|
ci: validate localtest
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
badFiles=()
|
|
||||||
while read f; do
|
|
||||||
badFiles+=("$f")
|
|
||||||
done < <(shfmt -l . | grep -v vendor/)
|
|
||||||
|
|
||||||
if [ ${#badFiles[@]} -eq 0 ]; then
|
|
||||||
echo 'Congratulations! All shell source files are properly formatted.'
|
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "These files are not properly shfmt'd:"
|
|
||||||
for f in "${badFiles[@]}"; do
|
|
||||||
echo " - $f"
|
|
||||||
done
|
|
||||||
echo
|
|
||||||
echo 'Please reformat the above files using "shfmt -w" and commit the result.'
|
|
||||||
echo
|
|
||||||
} >&2
|
|
||||||
false
|
|
||||||
fi
|
|
Loading…
Reference in New Issue