-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: improve git-fix and build/requirement notice (#105)
Signed-off-by: Tronje Krop <[email protected]>
- Loading branch information
Showing
8 changed files
with
61 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ export GOPATH ?= $(shell $(GO) env GOPATH) | |
export GOBIN ?= $(GOPATH)/bin | ||
|
||
# Setup go-make version to use desired build and config scripts. | ||
GOMAKE_DEP ?= github.com/tkrop/[email protected].102 | ||
GOMAKE_DEP ?= github.com/tkrop/[email protected].103 | ||
INSTALL_FLAGS ?= -mod=readonly -buildvcs=auto | ||
# Request targets from go-make targets target. | ||
TARGETS := $(shell command -v $(GOBIN)/go-make >/dev/null || \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
0.0.102 | ||
0.0.103 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ export GOPATH ?= $(shell $(GO) env GOPATH) | |
export GOBIN ?= $(GOPATH)/bin | ||
|
||
# Setup go-make version to use desired build and config scripts. | ||
GOMAKE_DEP ?= github.com/tkrop/[email protected].102 | ||
GOMAKE_DEP ?= github.com/tkrop/[email protected].103 | ||
INSTALL_FLAGS ?= -mod=readonly -buildvcs=auto | ||
# Request targets from go-make targets target. | ||
TARGETS := $(shell command -v $(GOBIN)/go-make >/dev/null || \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -242,7 +242,7 @@ go-pkg = $(shell awk -v mode="$(2)" -v filter="$(3)" \ | |
|
||
|
||
# Setup go-make to use desired build and config scripts. | ||
GOMAKE_DEP := github.com/tkrop/[email protected].102 | ||
GOMAKE_DEP := github.com/tkrop/[email protected].103 | ||
GOMAKE_MAKEFILE := $(realpath $(firstword $(MAKEFILE_LIST))) | ||
GOMAKE_MAKEFILES := $(GOMAKE_MAKEFILE) \ | ||
$(wildcard Makefile.vars) $(wildcard Makefile.ext) | ||
|
@@ -794,12 +794,15 @@ $(addprefix git-commit-,$(COMMIT_CONVENTION)):: git-commit-%: | |
@MESSAGE="$(ARGS)"; $(call git-message,$*,0); \ | ||
ARGS="" $(GIT) commit --signoff --message "$${MESSAGE}"; exit 0; | ||
#@ [(no-)edit|(no-)verify] # pushes the latest changes to the previous commit of the origin. | ||
git-fix:: | ||
@GITFIX=($(patsubst %,"%",$(GITFIX))); GITPUSH=($(patsubst %,"%",$(GITPUSH))); \ | ||
if [[ "$(ARGS)" =~ verify ]]; then GITFIX=("$${GITFIX[@]/--no-verify}"); fi; \ | ||
if [[ "$(ARGS)" =~ no-verify ]]; then GITFIX+=("--no-verify"); fi; \ | ||
if [[ "$(ARGS)" =~ edit ]]; then GITFIX=("$${GITFIX[@]/--no-edit}"); fi; \ | ||
if [[ "$(ARGS)" =~ no-edit ]]; then GITFIX+=("--no-edit"); fi; \ | ||
TARGETS_GIT_FIX := git-fix git-fix-all git-fix-edit git-fix-no-edit git-fix-verify git-fix-no-verify | ||
$(TARGETS_GIT_FIX):: git-fix%: | ||
@ARGS=" $(ARGS) $(*:-%=%) "; \ | ||
if [[ "$${ARGS}" =~ " all " ]]; then git add .; fi; \ | ||
GITFIX=($(patsubst %,"%",$(GITFIX))); GITPUSH=($(patsubst %,"%",$(GITPUSH))); \ | ||
if [[ "$${ARGS}" =~ " verify " ]]; then GITFIX=("$${GITFIX[@]/--no-verify}"); fi; \ | ||
if [[ "$${ARGS}" =~ " no-verify " ]]; then GITFIX+=("--no-verify"); fi; \ | ||
if [[ "$${ARGS}" =~ " edit " ]]; then GITFIX=("$${GITFIX[@]/--no-edit}"); fi; \ | ||
if [[ "$${ARGS}" =~ " no-edit " ]]; then GITFIX+=("--no-edit"); fi; \ | ||
for KEY in "$${!GITFIX[@]}"; do \ | ||
if [ "$${GITFIX[$${KEY}]}" == "" ]; then unset GITFIX[$${KEY}]; fi; \ | ||
done; \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters