Skip to content

Commit

Permalink
Merge pull request pathwar#567 from pathwar/dev/moul/maintenance
Browse files Browse the repository at this point in the history
chore: repo maintenance 🤖
  • Loading branch information
moul authored Jul 12, 2020
2 parents b47f215 + 3255004 commit f23ebc4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v1
with:
version: v1.27
version: v1.28
github-token: ${{ secrets.GITHUB_TOKEN }}
args: --timeout=2m
only-new-issues: false
Expand Down
3 changes: 3 additions & 0 deletions rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ all: help
##

rwildcard = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
check-program = $(foreach exec,$(1),$(if $(shell PATH="$(PATH)" which $(exec)),,$(error "No $(exec) in PATH")))

##
## rules.mk
Expand Down Expand Up @@ -96,6 +97,7 @@ INSTALL_STEPS += go.install

.PHONY: go.release
go.release:
$(call check-program, goreleaser)
goreleaser --snapshot --skip-publish --rm-dist
@echo -n "Do you want to release? [y/N] " && read ans && \
if [ $${ans:-N} = y ]; then set -xe; goreleaser --rm-dist; fi
Expand Down Expand Up @@ -238,6 +240,7 @@ ifdef DOCKER_IMAGE
ifneq ($(DOCKER_IMAGE),none)
.PHONY: docker.build
docker.build:
$(call check-program, docker)
$(call docker_build,$(DOCKERFILE_PATH),$(DOCKER_IMAGE))

BUILD_STEPS += docker.build
Expand Down

0 comments on commit f23ebc4

Please sign in to comment.