Skip to content

Commit

Permalink
Rename travisci make targets to ci (LeanerCloud#399)
Browse files Browse the repository at this point in the history
These targets are pretty much generic and do not need to run in TravisCI.
I have a use case where I am running some of them in a different CI
provider, so invoking `make travisci` is awkward.
  • Loading branch information
gabegorelick authored Jan 29, 2020
1 parent 8d2aded commit 2d76a9a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
# encrypted coveralls secret token, defined as the COVERALLS_TOKEN environment variable
secure: E0H+b3i171uG8e/w6AVV9HDCCcoReTNlk2+YSENFYmnzxBmvQOo2YwI1jtBRgktG51yZZCzUJZnc0bkaghRT6nS6H8gVUN5GuZjMXdEwY3r+2Zqka6sS1ym+PK6JEA1bRjtX2iQFtk2V68gzUNvjKj8YB2zVJmX6St7tcQ9lBcluQ0xEFu7MZMknYrl9W2NnAhajt27D50uUELtSo3n61TEXXIvFRQyjHCMpGmqeZcXYtiSZAyZjraTsZr9/dngOSw0iExXDDa7cYPHHmmre+3aQUJ9AzotgB+C3+SJ+zOaOGPvVc4PS/G2Wj4siQ1Yv3nl9pvGgxeKtZgVQ92KN9ngdVtRs+XnwMC/x9VJN8vHHgI+coETZ9lhwhjeS8yFIXdBaktXz014ZVrVVpSB+BzoW4r6x/MlmZh0muJNME5OGFXbR0qFaaUB9WdQCst+MhVvSKiZ3Slmck4/3UcyAsuePj0sF1Z/yv9YJR84NTEUdif/PQnBDC1ulhXAIhZ+gm7ZOMZXRW9U7YZlHnFpBg8KoVETlnkT6AjKZ5jy+gz4CgisN2H7OuyjVQm5kIEXPo8ORJqYHPM3tu9HVsCHb6Pm+y9pec/1YXSKtmFbJiYeAmbz3Lp8vVUX5tOo24o0hCyU7qA/ypCUxRoHrHHC+c9u8nQDWGcQBD0azp+dcy2s=
script:
- make travisci-docker
- make ci-docker
after_success:
- curl --request POST "https://goreportcard.com/checks" --data "repo=github.com/AutoSpotting/AutoSpotting"
deploy:
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -107,21 +107,21 @@ html-cover: test ## Display coverage
@go tool cover -html=$(COVER_PROFILE)
.PHONY: html-cover

travisci-cover: html-cover ## Test & generate coverage in the TravisCI format, fails unless executed from TravisCI
ci-cover: html-cover ## Test & generate coverage in the TravisCI format, fails unless executed from TravisCI
ifdef COVERALLS_TOKEN
@goveralls -coverprofile=$(COVER_PROFILE) -service=travis-ci -repotoken=$(COVERALLS_TOKEN)
endif
.PHONY: travisci-cover
.PHONY: ci-cover

travisci-checks: fmt-check vet-check lint ## Pass fmt / vet & lint format
.PHONY: travisci-checks
ci-checks: fmt-check vet-check lint ## Pass fmt / vet & lint format
.PHONY: ci-checks

travisci: archive travisci-checks travisci-cover ## Executes inside the TravisCI Docker builder
.PHONY: travisci
ci: archive ci-checks ci-cover ## Executes inside the CI Docker builder
.PHONY: ci

travisci-docker: ## Executed by TravisCI
ci-docker: ## Executed by CI
@docker-compose up --build --abort-on-container-exit --exit-code-from autospotting
.PHONY: travisci-docker
.PHONY: ci-docker

help: ## Show this help
@printf "Rules:\n"
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- TRAVIS_BUILD_NUMBER
entrypoint:
- make
- travisci
- ci
volumes:
- type: bind
source: ./build
Expand Down

0 comments on commit 2d76a9a

Please sign in to comment.