Skip to content

Commit 124d20a

Browse files
committed
drop custom shellcheck code
We'll now use the ci/shellcheck from the repo-templates since we enabled syncing it for COSA in [1]. [1] coreos/repo-templates#359
1 parent 23203e4 commit 124d20a

2 files changed

Lines changed: 2 additions & 44 deletions

File tree

Makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,8 @@ all: bin/coreos-assembler mantle
1919

2020
src:=$(shell find src -maxdepth 1 -type f -executable -print)
2121
pysources=$(shell find src -type f -name '*.py') $(shell for x in $(src); do if head -1 $$x | grep -q python; then echo $$x; fi; done)
22-
src_checked:=$(patsubst src/%,src/.%.shellchecked,${src})
2322
tests:=$(shell find tests -maxdepth 1 -type f -executable -print)
24-
tests_checked:=$(patsubst tests/%,tests/.%.shellchecked,${tests})
2523
cwd:=$(shell find . -maxdepth 1 -type f -executable -print)
26-
cwd_checked:=$(patsubst ./%,.%.shellchecked,${cwd})
2724
GOARCH:=$(shell uname -m)
2825
export COSA_META_SCHEMA:=$(shell pwd)/src/v1.json
2926
ifeq ($(GOARCH),x86_64)
@@ -45,10 +42,8 @@ bin/coreos-assembler:
4542
cd cmd && go build -mod vendor -o ../$@
4643
.PHONY: bin/coreos-assembler
4744

48-
.%.shellchecked: %
49-
./tests/check_one.sh $< $@
50-
51-
shellcheck: ${src_checked} ${tests_checked} ${cwd_checked}
45+
shellcheck:
46+
ci/shellcheck
5247

5348
check: flake8 pycheck schema-check mantle-check cosa-go-check
5449
echo OK

tests/check_one.sh

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)