From f9eb3421a8663d0ee964295d4b9abca09c33450a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 03:01:11 +0000 Subject: [PATCH 1/7] Bump github.com/essentialkaos/ek/v13 in the all group Bumps the all group with 1 update: [github.com/essentialkaos/ek/v13](https://github.com/essentialkaos/ek). Updates `github.com/essentialkaos/ek/v13` from 13.3.1 to 13.3.2 - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v13.3.1...v13.3.2) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index be3cda4..b3ff04d 100644 --- a/go.mod +++ b/go.mod @@ -2,9 +2,9 @@ module github.com/essentialkaos/gomakegen/v3 go 1.21 -require github.com/essentialkaos/ek/v13 v13.3.1 +require github.com/essentialkaos/ek/v13 v13.3.2 require ( github.com/essentialkaos/depsy v1.3.0 // indirect - golang.org/x/sys v0.23.0 // indirect + golang.org/x/sys v0.24.0 // indirect ) diff --git a/go.sum b/go.sum index 0cf4bc0..9b1a199 100644 --- a/go.sum +++ b/go.sum @@ -2,13 +2,13 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v13 v13.3.1 h1:RcBJrBeEKby4I8386FHYxbVhj3XbJP2SS0uz2AJH+1Q= -github.com/essentialkaos/ek/v13 v13.3.1/go.mod h1:RVf1NpNyK04xkBJ3NTUD1wNLWemY9/naVD4iEVjU2fA= +github.com/essentialkaos/ek/v13 v13.3.2 h1:Dl2o8a2tQbMFkkLRXRK1Piuuk/gjLRIXXC2r4ORQYSA= +github.com/essentialkaos/ek/v13 v13.3.2/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= From 40e92bd221817cd034e1219adfc0b6c2f7405208 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 02:33:17 +0000 Subject: [PATCH 2/7] Bump github.com/essentialkaos/ek/v13 in the all group Bumps the all group with 1 update: [github.com/essentialkaos/ek/v13](https://github.com/essentialkaos/ek). Updates `github.com/essentialkaos/ek/v13` from 13.3.2 to 13.3.3 - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v13.3.2...v13.3.3) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b3ff04d..2c4ad8d 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/essentialkaos/gomakegen/v3 go 1.21 -require github.com/essentialkaos/ek/v13 v13.3.2 +require github.com/essentialkaos/ek/v13 v13.3.3 require ( github.com/essentialkaos/depsy v1.3.0 // indirect diff --git a/go.sum b/go.sum index 9b1a199..94f3e42 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v13 v13.3.2 h1:Dl2o8a2tQbMFkkLRXRK1Piuuk/gjLRIXXC2r4ORQYSA= -github.com/essentialkaos/ek/v13 v13.3.2/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM= +github.com/essentialkaos/ek/v13 v13.3.3 h1:5I53QQnyG8hjVOlh5q8F3bNwrtN02wiPpoSocTU6JHA= +github.com/essentialkaos/ek/v13 v13.3.3/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= From 1f95cf07b8a615c594ae1e99378273ead72ea96c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 02:13:33 +0000 Subject: [PATCH 3/7] Bump github.com/essentialkaos/ek/v13 in the all group Bumps the all group with 1 update: [github.com/essentialkaos/ek/v13](https://github.com/essentialkaos/ek). Updates `github.com/essentialkaos/ek/v13` from 13.3.3 to 13.3.5 - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v13.3.3...v13.3.5) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v13 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2c4ad8d..5f738d9 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/essentialkaos/gomakegen/v3 go 1.21 -require github.com/essentialkaos/ek/v13 v13.3.3 +require github.com/essentialkaos/ek/v13 v13.3.5 require ( github.com/essentialkaos/depsy v1.3.0 // indirect diff --git a/go.sum b/go.sum index 94f3e42..d14056a 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v13 v13.3.3 h1:5I53QQnyG8hjVOlh5q8F3bNwrtN02wiPpoSocTU6JHA= -github.com/essentialkaos/ek/v13 v13.3.3/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM= +github.com/essentialkaos/ek/v13 v13.3.5 h1:k/lfDIpgE+8dOc+eF37m1hOi8eEMHYYTEzD5KHH3xxU= +github.com/essentialkaos/ek/v13 v13.3.5/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= From 86850dcd92fc21aa4b0d0a3e765cdeff36dd1935 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 20 Aug 2024 23:16:23 +0300 Subject: [PATCH 4/7] Improve Dependabot configuration --- .github/dependabot.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d0ad1de..1141609 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,8 +6,8 @@ updates: target-branch: "develop" schedule: interval: "daily" - timezone: "Europe/London" - time: "03:00" + timezone: "Etc/UTC" + time: "07:00" labels: - "PR • MAINTENANCE" assignees: @@ -26,8 +26,8 @@ updates: target-branch: "develop" schedule: interval: "daily" - timezone: "Europe/London" - time: "04:00" + timezone: "Etc/UTC" + time: "08:00" labels: - "PR • MAINTENANCE" assignees: From b767bf09c2d947293b69c307013f6f651f6dd794 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 20 Aug 2024 23:17:27 +0300 Subject: [PATCH 5/7] Add flag PROXY to Makefile for force proxy using to downloading dependencies --- cli/cli.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cli/cli.go b/cli/cli.go index 8a17323..432e6ac 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -47,7 +47,7 @@ import ( // App info const ( APP = "GoMakeGen" - VER = "3.0.6" + VER = "3.1.0" DESC = "Utility for generating makefiles for Go applications" ) @@ -1199,6 +1199,10 @@ func (m *Makefile) getDefaultVariables() string { result += "VERBOSE_FLAG = -v\n" result += "endif\n\n" + result += "ifdef PROXY ## Force proxy usage for downloading dependencies (Flag)\n" + result += "export GOPROXY=https://proxy.golang.org/cached-only,direct\n" + result += "endif\n\n" + if m.ModUsed { result += "COMPAT ?= 1.19\n" } From 0411037f36bcf3bde885288969116ea033cc84e6 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 20 Aug 2024 23:53:19 +0300 Subject: [PATCH 6/7] Update supported Go versions --- .github/workflows/ci.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f564f5..d4d2fa5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: strategy: matrix: - go: [ '1.19.x', '1.20.x', '1.21.x', '1.22.x' ] + go: [ '1.22.x', '1.23.x' ] steps: - name: Checkout diff --git a/README.md b/README.md index 0afbf42..f5411ff 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ ### Installation -To build the `gomakegen` from scratch, make sure you have a working Go 1.19+ workspace (_[instructions](https://go.dev/doc/install)_), then: +To build the `gomakegen` from scratch, make sure you have a working Go 1.22+ workspace (_[instructions](https://go.dev/doc/install)_), then: ``` go install github.com/essentialkaos/gomakegen/v3@latest From a013bbda9c51e819f93283b3cd6b7feddecefdb1 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 20 Aug 2024 23:54:02 +0300 Subject: [PATCH 7/7] Regenerate Makefile with the latest version of gomakegen --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6e037c1..081db21 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ################################################################################ -# This Makefile generated by GoMakeGen 3.0.6 using next command: +# This Makefile generated by GoMakeGen 3.1.0 using next command: # gomakegen --mod --strip . # # More info: https://kaos.sh/gomakegen @@ -11,6 +11,10 @@ ifdef VERBOSE ## Print verbose information (Flag) VERBOSE_FLAG = -v endif +ifdef PROXY ## Force proxy usage for downloading dependencies (Flag) +export GOPROXY=https://proxy.golang.org/cached-only,direct +endif + COMPAT ?= 1.19 MAKEDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD) @@ -109,6 +113,6 @@ help: ## Show this info | sed 's/ifdef //' \ | awk 'BEGIN {FS = " .*?## "}; {printf " \033[32m%-11s\033[0m %s\n", $$1, $$2}' @echo -e '' - @echo -e '\033[90mGenerated by GoMakeGen 3.0.6\033[0m\n' + @echo -e '\033[90mGenerated by GoMakeGen 3.1.0\033[0m\n' ################################################################################