diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 332fdee..d133420 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,7 +8,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.2 + go-version: 1.23.3 cache: false - name: Checkout code @@ -32,7 +32,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.2 + go-version: 1.23.3 - name: Setup Npm uses: pnpm/action-setup@v4 @@ -57,7 +57,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.2 + go-version: 1.23.3 - name: Setup Npm uses: pnpm/action-setup@v4 @@ -79,7 +79,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.2 + go-version: 1.23.3 - name: Checkout code uses: actions/checkout@v4 @@ -101,7 +101,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.2 + go-version: 1.23.3 - name: Checkout code uses: actions/checkout@v4 @@ -124,7 +124,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.2 + go-version: 1.23.3 - name: Checkout code uses: actions/checkout@v4 diff --git a/Makefile b/Makefile index 302a55d..32fd511 100644 --- a/Makefile +++ b/Makefile @@ -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/go-make@v0.0.113 +GOMAKE_DEP ?= github.com/tkrop/go-make@v0.0.114 INSTALL_FLAGS ?= -mod=readonly -buildvcs=auto # Request targets from go-make targets target. TARGETS := $(shell command -v $(GOBIN)/go-make >/dev/null || \ diff --git a/VERSION b/VERSION index 9fdfff6..58ca857 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.113 +0.0.114 diff --git a/config/Makefile b/config/Makefile index 302a55d..32fd511 100644 --- a/config/Makefile +++ b/config/Makefile @@ -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/go-make@v0.0.113 +GOMAKE_DEP ?= github.com/tkrop/go-make@v0.0.114 INSTALL_FLAGS ?= -mod=readonly -buildvcs=auto # Request targets from go-make targets target. TARGETS := $(shell command -v $(GOBIN)/go-make >/dev/null || \ diff --git a/config/Makefile.base b/config/Makefile.base index 331c074..4f4ed4f 100644 --- a/config/Makefile.base +++ b/config/Makefile.base @@ -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/go-make@v0.0.113 +GOMAKE_DEP := github.com/tkrop/go-make@v0.0.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))) diff --git a/go.mod b/go.mod index 80931e1..4e3689a 100644 --- a/go.mod +++ b/go.mod @@ -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 ) diff --git a/go.sum b/go.sum index 7bf36e9..26df4f5 100644 --- a/go.sum +++ b/go.sum @@ -12,18 +12,18 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tkrop/go-config v0.0.8 h1:MHRzUVhKZa9zc6GxllMCFDh2XS7V0tU4nGS8qegN2Ao= -github.com/tkrop/go-config v0.0.8/go.mod h1:4Q4BXw690MjwATurzgiGwK69k48eXZWW4lo3O22fYo4= -github.com/tkrop/go-testing v0.0.21 h1:lCSLCqsa0KUKOjGOd5euUIpmctSZy9eO7e1pwe2ym2A= -github.com/tkrop/go-testing v0.0.21/go.mod h1:RFUX2nk7n4QPUN0doC4R0KS6PqeaK1vWUDy3tBtjjKQ= +github.com/tkrop/go-config v0.0.11 h1:hoPXEn+wJdaERdGZbnL4RWC2Txh3jIZavXDx3lb9aAM= +github.com/tkrop/go-config v0.0.11/go.mod h1:tSKH24Ix55mmPLuEup9y5aXHe8nDmh0n95m5FEO0zc0= +github.com/tkrop/go-testing v0.0.22 h1:zRxOdj4XAmafww6QtdkQlnqlZCnN14DbxSyZSWWjFx0= +github.com/tkrop/go-testing v0.0.22/go.mod h1:S9WAo/AbkqDLp1Jxu8Cd+fbmdgJmyDhv+CruOEBDlIY= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -39,8 +39,8 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=