Skip to content

Commit d111ec1

Browse files
committed
update "clean" make target
- fix travis merge error
1 parent 8b43c8f commit d111ec1

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

.travis.yml

-5
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ jobs:
3131
# script: golangci-lint run # run a bunch of code checkers/linters in parallel
3232
before_script:
3333
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.27.0
34-
<<<<<<< HEAD
35-
- golangci-lint --version # test that we got it
36-
- pwd; ls -altr; ls -alR
37-
=======
3834
script:
39-
>>>>>>> de22ee4... Travis testing (#85)
4035
- make download
4136
- make lint
4237
- stage: test

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ run:
5959
@go run $(CMD) -c config/example.yml
6060

6161
clean:
62-
@rm -rf internal/bridgr/asset/templates.go coverage.out packages tests.xml tests.out coverage.out *.sha256 main code-quality-report.json $(PKG)
62+
@rm -rf internal/bridgr/asset/templates.go coverage.out packages tests.xml tests.out coverage.out *.sha256 main code-quality-report.json $(PKG)-*
6363
@docker rm --force bridgr_yum bridgr_python bridgr_ruby &> /dev/null || true
6464

6565
generate: $(GO_FILES)

0 commit comments

Comments
 (0)