diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78f136f..f4951f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,11 @@ jobs: env: SRC_DIR: src/github.com/${{ github.repository }} + GO111MODULE: auto strategy: matrix: - go: [ '1.14.x', '1.15.x' ] + go: [ '1.15.x', '1.16.x' ] steps: - name: Set up Go diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index da7adf3..ce19a79 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -19,9 +19,6 @@ jobs: with: fetch-depth: 2 - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: diff --git a/README.md b/README.md index 647b157..75f44f1 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@
@@ -22,22 +22,10 @@ #### From source -Before the initial install, allow git to use redirects for [pkg.re](https://github.com/essentialkaos/pkgre) service (_reason why you should do this described [here](https://github.com/essentialkaos/pkgre#git-support)_): +To build the `fz` from scratch, make sure you have a working Go 1.15+ workspace (_[instructions](https://golang.org/doc/install)_), then: ``` -git config --global http.https://pkg.re.followRedirects true -``` - -To build the `fz` from scratch, make sure you have a working Go 1.13+ workspace (_[instructions](https://golang.org/doc/install)_), then: - -``` -go get github.com/essentialkaos/fz -``` - -If you want to update `fz` to latest stable release, do: - -``` -go get -u github.com/essentialkaos/fz +go install github.com/essentialkaos/fz ``` #### Prebuilt binaries @@ -65,8 +53,8 @@ Options | Branch | Status | |--------|--------| -| `master` | [![CI](https://github.com/essentialkaos/fz/workflows/CI/badge.svg?branch=master)](https://github.com/essentialkaos/fz/actions) | -| `develop` | [![CI](https://github.com/essentialkaos/fz/workflows/CI/badge.svg?branch=develop)](https://github.com/essentialkaos/fz/actions) | +| `master` | [![CI](https://kaos.sh/w/fz/ci.svg?branch=master)](https://kaos.sh/w/fz/ci?query=branch:master) | +| `develop` | [![CI](https://kaos.sh/w/fz/ci.svg?branch=develop)](https://kaos.sh/w/fz/ci?query=branch:develop) | ### Contributing diff --git a/fz.go b/fz.go index 26c198f..171d281 100644 --- a/fz.go +++ b/fz.go @@ -34,7 +34,7 @@ import ( // App info const ( APP = "fz" - VER = "0.0.3" + VER = "0.0.4" DESC = "Tool for formatting go-fuzz output" ) @@ -176,14 +176,14 @@ func parseInfoLine(data string) (Info, bool) { info.DateTime += " " + strutil.ReadField(dataSlice[0], 1, false, " ") info.Workers, _ = strconv.Atoi(strutil.ReadField(dataSlice[0], 3, false, " ")) info.Corpus, _ = strconv.Atoi(strutil.ReadField(dataSlice[1], 1, false, " ")) - info.CorpusDur = timeutil.ParseDuration(corpusDate) + info.CorpusDur, _ = timeutil.ParseDuration(corpusDate) info.Crashers, _ = strconv.Atoi(strutil.ReadField(dataSlice[2], 1, false, " ")) info.Restarts = strutil.ReadField(dataSlice[3], 1, false, " ") info.Execs, _ = strconv.Atoi(strutil.ReadField(dataSlice[4], 1, false, " ")) execsPerSec := strings.Trim(strutil.ReadField(dataSlice[4], 2, false, " "), "(/sec)") info.ExecsPerSec, _ = strconv.Atoi(execsPerSec) info.Cover, _ = strconv.Atoi(strutil.ReadField(dataSlice[5], 1, false, " ")) - info.Uptime = timeutil.ParseDuration(uptime) + info.Uptime, _ = timeutil.ParseDuration(uptime) return info, true }