Skip to content
This repository has been archived by the owner on Sep 28, 2020. It is now read-only.

Commit

Permalink
checks.sh: remove deadcode (for now) because it's breaking on contain…
Browse files Browse the repository at this point in the history
…ers/storage

Signed-off-by: Erik Hollensbe <github@hollensbe.org>
  • Loading branch information
Erik Hollensbe committed Feb 14, 2017
1 parent d49d6c9 commit 003e483
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
PACKAGES := ./cli-tests ./builder ./builder/executor/docker ./layers ./image ./tar ./multi
BUILD_TAGS := "btrfs_noversion libdm_no_deferred_remove"

all: checks install

fetch:
cd vendor/github.com/mitchellh/go-mruby && MRUBY_CONFIG=$(shell pwd)/mruby_config.rb make

install: fetch
go install -v .
go install -tags $(BUILD_TAGS) .

clean:
cd vendor/github.com/mitchellh/go-mruby && make clean
Expand All @@ -23,10 +24,10 @@ checks: fetch
@sh checks.sh

build:
go run main.go build.rb
go run -tags $(BUILD_TAGS) main.go build.rb

build-ci:
CI_BUILD=1 go run main.go --no-tty build.rb
CI_BUILD=1 go run -tags $(BUILD_TAGS) main.go --no-tty build.rb

run-test-ci:
docker run -e "TESTRUN=$(TESTRUN)" --privileged --rm -i box-test
Expand Down
22 changes: 11 additions & 11 deletions checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ then
exit 1
fi

echo "Running deadcode..."
[ -n "`which deadcode`" ] || go get github.com/remyoudompheng/go-misc/deadcode/...
set +e
out=$(deadcode ${dirs} 2>&1)
set -e
if [ "`echo \"${out}\" | sed '/^$/d' | wc -l`" -gt 0 ]
then
echo 1>&2 "deadcode errors in:"
echo 1>&2 "${out}"
exit 1
fi
# echo "Running deadcode..."
# [ -n "`which deadcode`" ] || go get github.com/remyoudompheng/go-misc/deadcode/...
# set +e
# out=$(deadcode ${dirs} 2>&1)
# set -e
# if [ "`echo \"${out}\" | sed '/^$/d' | wc -l`" -gt 0 ]
# then
# echo 1>&2 "deadcode errors in:"
# echo 1>&2 "${out}"
# exit 1
# fi

0 comments on commit 003e483

Please sign in to comment.