From b53339314c5440dd235a93d8b769110b429e79d6 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 29 Mar 2022 16:41:28 +0300 Subject: [PATCH 1/3] Migrate to go modules + Improve GitHub actions workflows --- .github/dependabot.yml | 30 ++++++++++++++++++++++++++++++ .github/workflows/ci.yml | 6 +++--- Makefile | 24 ++++++++++++++++-------- common/uc.spec | 7 ++++++- go.mod | 7 +++++++ go.sum | 27 +++++++++++++++++++++++++++ uc.go | 26 +++++++++++++------------- 7 files changed, 102 insertions(+), 25 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 go.mod create mode 100644 go.sum diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..fc51337 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,30 @@ +version: 2 + +updates: + - package-ecosystem: "gomod" + directory: "/" + target-branch: "develop" + schedule: + interval: "daily" + timezone: "Europe/London" + time: "03:00" + labels: + - "PR • MAINTENANCE" + assignees: + - "andyone" + reviewers: + - "andyone" + + - package-ecosystem: "github-actions" + directory: "/" + target-branch: "develop" + schedule: + interval: "daily" + timezone: "Europe/London" + time: "04:00" + labels: + - "PR • MAINTENANCE" + assignees: + - "andyone" + reviewers: + - "andyone" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f446847..f01038c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: - go: [ '1.16.x', '1.17.x' ] + go: [ '1.17.x', '1.18.x' ] steps: - name: Set up Go @@ -35,7 +35,7 @@ jobs: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: ${{env.SRC_DIR}} @@ -55,7 +55,7 @@ jobs: steps: - name: Code checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Login to DockerHub uses: docker/login-action@v1 diff --git a/Makefile b/Makefile index 8afc579..2645cd5 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,16 @@ ################################################################################ -# This Makefile generated by GoMakeGen 1.3.1 using next command: -# gomakegen . +# This Makefile generated by GoMakeGen 1.5.1 using next command: +# gomakegen --mod . # # More info: https://kaos.sh/gomakegen ################################################################################ +export GO111MODULE=on + .DEFAULT_GOAL := help -.PHONY = fmt vet all clean git-config deps help +.PHONY = fmt vet all clean deps mod-init mod-update mod-vendor help ################################################################################ @@ -23,11 +25,17 @@ install: ## Install all binaries uninstall: ## Uninstall all binaries rm -f /usr/bin/uc -git-config: ## Configure git redirects for stable import path services - git config --global http.https://pkg.re.followRedirects true +deps: mod-update ## Download dependencies + +mod-init: ## Initialize new module + go mod init + go mod tidy + +mod-update: ## Download modules to local cache + go mod download -deps: git-config ## Download dependencies - go get -d -v pkg.re/essentialkaos/ek.v12 +mod-vendor: ## Make vendored copy of dependencies + go mod vendor fmt: ## Format source code with gofmt find . -name "*.go" -exec gofmt -s -w {} \; @@ -43,6 +51,6 @@ help: ## Show this info @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \ | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-12s\033[0m %s\n", $$1, $$2}' @echo -e '' - @echo -e '\033[90mGenerated by GoMakeGen 1.3.1\033[0m\n' + @echo -e '\033[90mGenerated by GoMakeGen 1.5.1\033[0m\n' ################################################################################ diff --git a/common/uc.spec b/common/uc.spec index da64adf..f033ade 100644 --- a/common/uc.spec +++ b/common/uc.spec @@ -10,7 +10,7 @@ Summary: Simple utility for counting unique lines Name: uc -Version: 1.0.0 +Version: 1.0.1 Release: 0%{?dist} Group: Applications/System License: Apache License, Version 2.0 @@ -62,6 +62,11 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Tue Mar 29 2022 Anton Novojilov - 1.0.1-0 +- Removed pkg.re usage +- Added module info +- Added Dependabot configuration + * Thu Oct 22 2020 Anton Novojilov - 1.0.0-0 - Added possibility to define -m/--max option as number with K and M - Added man page generation diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..b477986 --- /dev/null +++ b/go.mod @@ -0,0 +1,7 @@ +module github.com/essentialkaos/uc + +go 1.17 + +require github.com/essentialkaos/ek/v12 v12.42.1 + +require golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..2a04230 --- /dev/null +++ b/go.sum @@ -0,0 +1,27 @@ +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/essentialkaos/check v1.2.1 h1:avvyFy/1acUNwfxwuOLsHeCjfXtMygtbu0lVDr3nxFs= +github.com/essentialkaos/check v1.2.1/go.mod h1:PhxzfJWlf5L/skuyhzBLIvjMB5Xu9TIyDIsqpY5MvB8= +github.com/essentialkaos/ek/v12 v12.42.1 h1:h3PPy0XNXUj1IsEid/p9IzaF0o5hZEGOBFh7XZawAyg= +github.com/essentialkaos/ek/v12 v12.42.1/go.mod h1:Cv/tOZshmFg4pMJnBkg4aW/WyYhzzc41qzZIfk5RSi4= +github.com/essentialkaos/go-linenoise/v3 v3.3.5/go.mod h1:g4X3LhT83XT4h7xwrCLclAdMkJvS9qWBQTGNdS6y4vo= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +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.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= diff --git a/uc.go b/uc.go index e0f9f43..a512cfb 100644 --- a/uc.go +++ b/uc.go @@ -19,18 +19,18 @@ import ( "sync" "time" - "pkg.re/essentialkaos/ek.v12/fmtc" - "pkg.re/essentialkaos/ek.v12/fmtutil" - "pkg.re/essentialkaos/ek.v12/fsutil" - "pkg.re/essentialkaos/ek.v12/options" - "pkg.re/essentialkaos/ek.v12/signal" - "pkg.re/essentialkaos/ek.v12/strutil" - "pkg.re/essentialkaos/ek.v12/usage" - "pkg.re/essentialkaos/ek.v12/usage/completion/bash" - "pkg.re/essentialkaos/ek.v12/usage/completion/fish" - "pkg.re/essentialkaos/ek.v12/usage/completion/zsh" - "pkg.re/essentialkaos/ek.v12/usage/man" - "pkg.re/essentialkaos/ek.v12/usage/update" + "github.com/essentialkaos/ek/v12/fmtc" + "github.com/essentialkaos/ek/v12/fmtutil" + "github.com/essentialkaos/ek/v12/fsutil" + "github.com/essentialkaos/ek/v12/options" + "github.com/essentialkaos/ek/v12/signal" + "github.com/essentialkaos/ek/v12/strutil" + "github.com/essentialkaos/ek/v12/usage" + "github.com/essentialkaos/ek/v12/usage/completion/bash" + "github.com/essentialkaos/ek/v12/usage/completion/fish" + "github.com/essentialkaos/ek/v12/usage/completion/zsh" + "github.com/essentialkaos/ek/v12/usage/man" + "github.com/essentialkaos/ek/v12/usage/update" ) // ////////////////////////////////////////////////////////////////////////////////// // @@ -38,7 +38,7 @@ import ( // Application basic info const ( APP = "uc" - VER = "1.0.0" + VER = "1.0.1" DESC = "Tool for counting unique lines" ) From c90fcf990d520dff4413a40402edb8f1aa2300aa Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 29 Mar 2022 16:46:49 +0300 Subject: [PATCH 2/3] Improve spec --- common/uc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/uc.spec b/common/uc.spec index f033ade..adbb6d8 100644 --- a/common/uc.spec +++ b/common/uc.spec @@ -20,7 +20,7 @@ Source0: https://source.kaos.st/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: golang >= 1.14 +BuildRequires: golang >= 1.17 Provides: %{name} = %{version}-%{release} From fb83c2754ef732f68bb53fe693d643a850f0f7db Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 1 Apr 2022 01:00:35 +0300 Subject: [PATCH 3/3] Improve spec --- .gitignore | 2 ++ common/uc.spec | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..707d379 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +vendor +uc diff --git a/common/uc.spec b/common/uc.spec index adbb6d8..07a6af4 100644 --- a/common/uc.spec +++ b/common/uc.spec @@ -36,7 +36,9 @@ Simple utility for counting unique lines. %build export GOPATH=$(pwd) -go build src/github.com/essentialkaos/%{name}/%{name}.go +pushd src/github.com/essentialkaos/%{name} + go build -mod vendor -o $GOPATH/%{name} %{name}.go +popd %install rm -rf %{buildroot}