-
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.
Signed-off-by: Tronje Krop <[email protected]>
- Loading branch information
Showing
7 changed files
with
24 additions
and
25 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].113 | ||
| GOMAKE_DEP ?= github.com/tkrop/[email protected].114 | ||
| 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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| 0.0.113 | ||
| 0.0.114 |
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].113 | ||
| GOMAKE_DEP ?= github.com/tkrop/[email protected].114 | ||
| 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 |
|---|---|---|
|
|
@@ -98,7 +98,7 @@ MAKEFLAGS += --not-keep-going | |
| MAKEFLAGS := $(sort $(MAKEFLAGS)) | ||
|
|
||
| # Setup default directories of projects. | ||
| DIR_CONFIG := $(HOME)/.config/go-make/$(CURDIR:$(HOME)/%=%) | ||
| DIR_CONFIG := $(abspath $(HOME)/.config/go-make/$(CURDIR:$(HOME)/%=%)) | ||
| DIR_BUILD := $(CURDIR)/build | ||
| DIR_RUN := $(CURDIR)/run | ||
| DIR_CRED := $(DIR_RUN)/creds | ||
|
|
@@ -247,7 +247,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].113 | ||
| GOMAKE_DEP := github.com/tkrop/[email protected].114 | ||
| GOMAKE_MAKEFILE := $(realpath $(firstword $(MAKEFILE_LIST))) | ||
| GOMAKE_MAKEFILES := $(GOMAKE_MAKEFILE) \ | ||
| $(wildcard Makefile.vars) $(wildcard Makefile.ext) | ||
|
|
@@ -333,7 +333,7 @@ GITHOOKS ?= pre-commit # commit-msg | |
| GITAUTHOR ?= $$(echo -n "$$(git config --get user.name) <$$(git config --get user.email)>") | ||
| GITROOT := $(shell git rev-parse --show-toplevel 2>/dev/null || echo $(CURDIR)) | ||
| GITURL := $(shell $(GIT) remote get-url origin 2>/dev/null | \ | ||
| sed "s/^https:\/\///; s/^git@//; s/.git$$//; s/:/\//") | ||
| sed "s/^https:\/\///; s/^git@//; s/.git$$//; s/:/\//; s/^x-access-token:[^@]*@//") | ||
| GITHOST := $(word 1,$(subst /, ,$(GITURL))) | ||
| GITOWNER := $(word 2,$(subst /, ,$(GITURL))) | ||
| GITREPO := $(word 3,$(subst /, ,$(GITURL))) | ||
|
|
||
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,20 +1,19 @@ | ||
| module github.com/tkrop/go-make | ||
|
|
||
| go 1.23.2 | ||
| go 1.23.3 | ||
|
|
||
| require ( | ||
| github.com/golang/mock v1.6.0 | ||
| github.com/stretchr/testify v1.9.0 | ||
| github.com/tkrop/go-config v0.0.8 | ||
| github.com/tkrop/go-testing v0.0.21 | ||
| github.com/tkrop/go-config v0.0.11 | ||
| github.com/tkrop/go-testing v0.0.22 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect | ||
| github.com/kr/text v0.2.0 // indirect | ||
| github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect | ||
| github.com/rogpeppe/go-internal v1.12.0 // indirect | ||
| github.com/sirupsen/logrus v1.9.3 // indirect | ||
| golang.org/x/sys v0.26.0 // indirect | ||
| golang.org/x/sys v0.27.0 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| ) |
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