update "clean" make target

- fix travis merge error
aztechian · Jul 4, 2020 · d111ec1 · d111ec1
1 parent 8b43c8f
commit d111ec1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,12 +31,7 @@ jobs:
       # script: golangci-lint run # run a bunch of code checkers/linters in parallel
       before_script:
         - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.27.0
-<<<<<<< HEAD
-        - golangci-lint --version # test that we got it
-        - pwd; ls -altr; ls -alR
-=======
       script:
->>>>>>> de22ee4... Travis testing (#85)
         - make download
         - make lint
     - stage: test

diff --git a/Makefile b/Makefile
@@ -59,7 +59,7 @@ run:
 	@go run $(CMD) -c config/example.yml
 
 clean:
-	@rm -rf internal/bridgr/asset/templates.go coverage.out packages tests.xml tests.out coverage.out *.sha256 main code-quality-report.json $(PKG)
+	@rm -rf internal/bridgr/asset/templates.go coverage.out packages tests.xml tests.out coverage.out *.sha256 main code-quality-report.json $(PKG)-*
 	@docker rm --force bridgr_yum bridgr_python bridgr_ruby &> /dev/null || true
 
 generate: $(GO_FILES)