From 1c43b3b69954a68920c66e11a9e97a22b93bd243 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 30 Mar 2022 01:39:45 +0300 Subject: [PATCH] Migrate to go modules + Improve GitHub actions workflows --- .github/dependabot.yml | 30 ++++++++++++++++++++++++++++++ .github/workflows/ci.yml | 4 ++-- .github/workflows/codeql.yml | 2 +- Makefile | 33 ++++++++++++++++++++++----------- fz.go | 26 +++++++++++++------------- go.mod | 14 ++++++++++++++ go.sum | 26 ++++++++++++++++++++++++++ gofuzz/fuzz.go | 2 +- gofuzz/gofuzz.go | 4 ++-- gofuzz/gofuzz_test.go | 4 ++-- 10 files changed, 113 insertions(+), 32 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 d35fd90..3b43799 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - go: [ '1.16.x', '1.17.x' ] + go: [ '1.17.x', '1.18.x' ] steps: - name: Set up Go @@ -33,7 +33,7 @@ jobs: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: ${{env.SRC_DIR}} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ce19a79..3444662 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -6,7 +6,7 @@ on: pull_request: branches: [master] schedule: - - cron: '0 19 * * 1,3,5' + - cron: '0 17 * * 1,3,5' jobs: analyse: diff --git a/Makefile b/Makefile index 841d629..3481564 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,16 @@ ################################################################################ -# This Makefile generated by GoMakeGen 1.3.2 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 deps-test test help +.PHONY = fmt vet all clean deps deps-test test gen-fuzz mod-init mod-update mod-vendor help ################################################################################ @@ -23,18 +25,27 @@ install: ## Install all binaries uninstall: ## Uninstall all binaries rm -f /usr/bin/fz -git-config: ## Configure git redirects for stable import path services - git config --global http.https://pkg.re.followRedirects true - -deps: git-config ## Download dependencies - go get -d -v pkg.re/essentialkaos/ek.v12 +deps: mod-update ## Download dependencies -deps-test: git-config ## Download dependencies for tests - go get -d -v pkg.re/essentialkaos/check.v1 +deps-test: deps ## Download dependencies for tests test: ## Run tests go test -covermode=count ./gofuzz +gen-fuzz: ## Generate archives for fuzz testing + which go-fuzz-build &>/dev/null || go get -u -v github.com/dvyukov/go-fuzz/go-fuzz-build + go-fuzz-build -o gofuzz-fuzz.zip github.com/essentialkaos/fz/gofuzz + +mod-init: ## Initialize new module + go mod init + go mod tidy + +mod-update: ## Download modules to local cache + go mod download + +mod-vendor: ## Make vendored copy of dependencies + go mod vendor + fmt: ## Format source code with gofmt find . -name "*.go" -exec gofmt -s -w {} \; @@ -49,6 +60,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.2\033[0m\n' + @echo -e '\033[90mGenerated by GoMakeGen 1.5.1\033[0m\n' ################################################################################ diff --git a/fz.go b/fz.go index dcea087..3c38e88 100644 --- a/fz.go +++ b/fz.go @@ -2,7 +2,7 @@ package main // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -15,17 +15,17 @@ import ( "strings" "time" - "pkg.re/essentialkaos/ek.v12/fmtc" - "pkg.re/essentialkaos/ek.v12/fmtutil" - "pkg.re/essentialkaos/ek.v12/options" - "pkg.re/essentialkaos/ek.v12/signal" - "pkg.re/essentialkaos/ek.v12/timeutil" - "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/options" + "github.com/essentialkaos/ek/v12/signal" + "github.com/essentialkaos/ek/v12/timeutil" + "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" "github.com/essentialkaos/fz/gofuzz" ) @@ -35,7 +35,7 @@ import ( // App info const ( APP = "fz" - VER = "1.0.0" + VER = "1.0.1" DESC = "Tool for formatting go-fuzz output" ) diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..01ea4f6 --- /dev/null +++ b/go.mod @@ -0,0 +1,14 @@ +module github.com/essentialkaos/fz + +go 1.17 + +require ( + github.com/essentialkaos/check v1.2.1 + github.com/essentialkaos/ek/v12 v12.42.1 +) + +require ( + github.com/kr/pretty v0.3.0 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/rogpeppe/go-internal v1.6.1 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..62a05b4 --- /dev/null +++ b/go.sum @@ -0,0 +1,26 @@ +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/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/gofuzz/fuzz.go b/gofuzz/fuzz.go index 1126eb5..1ee4f75 100644 --- a/gofuzz/fuzz.go +++ b/gofuzz/fuzz.go @@ -4,7 +4,7 @@ package gofuzz // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/gofuzz/gofuzz.go b/gofuzz/gofuzz.go index ead142f..e29e00b 100644 --- a/gofuzz/gofuzz.go +++ b/gofuzz/gofuzz.go @@ -2,7 +2,7 @@ package gofuzz // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -13,7 +13,7 @@ import ( "strings" "time" - "pkg.re/essentialkaos/ek.v12/strutil" + "github.com/essentialkaos/ek/v12/strutil" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/gofuzz/gofuzz_test.go b/gofuzz/gofuzz_test.go index 7028158..7f10b4f 100644 --- a/gofuzz/gofuzz_test.go +++ b/gofuzz/gofuzz_test.go @@ -2,7 +2,7 @@ package gofuzz // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -10,7 +10,7 @@ package gofuzz import ( "testing" - . "pkg.re/essentialkaos/check.v1" + . "github.com/essentialkaos/check" ) // ////////////////////////////////////////////////////////////////////////////////// //