From a24e20252af4ea13516c3cf0f73937b21603e5c1 Mon Sep 17 00:00:00 2001 From: moul-bot Date: Sun, 12 Jul 2020 14:04:09 +0200 Subject: [PATCH] =?UTF-8?q?chore:=20repo=20maintenance=20=F0=9F=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit more details: https://github.com/moul/repoman Signed-off-by: moul-bot --- .github/workflows/ci.yml | 2 +- AUTHORS | 1 + rules.mk | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 783facd..6130aa5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: - name: lint uses: golangci/golangci-lint-action@v0.1.7 with: - version: v1.26 + version: v1.28 github-token: ${{ secrets.GITHUB_TOKEN }} tests-on-windows: needs: golangci-lint # run after golangci-lint action to not produce duplicated errors diff --git a/AUTHORS b/AUTHORS index e415b79..78e221c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -19,6 +19,7 @@ Manuel Sabban Mathieu Pasquet Mikael Rapp MitaliBo +moul-bot Nelly Asher NocFlame Quentin Perez diff --git a/rules.mk b/rules.mk index 19f0767..1d90565 100644 --- a/rules.mk +++ b/rules.mk @@ -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 @@ -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 @@ -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