Skip to content

Commit

Permalink
Merge pull request #10 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 0.0.4
  • Loading branch information
andyone authored Jun 26, 2021
2 parents 27ddf16 + 9ae353a commit c598bab
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 27 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
28 changes: 8 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<p align="center"><a href="#readme"><img src="https://gh.kaos.st/fz.svg"/></a></p>

<p align="center">
<a href="https://github.com/essentialkaos/fz/actions"><img src="https://github.com/essentialkaos/fz/workflows/CI/badge.svg" alt="GitHub Actions Status" /></a>
<a href="https://github.com/essentialkaos/fz/actions?query=workflow%3ACodeQL"><img src="https://github.com/essentialkaos/fz/workflows/CodeQL/badge.svg" /></a>
<a href="https://goreportcard.com/report/github.com/essentialkaos/fz"><img src="https://goreportcard.com/badge/github.com/essentialkaos/fz"></a>
<a href="https://codebeat.co/projects/github-com-essentialkaos-fz-master"><img alt="codebeat badge" src="https://codebeat.co/badges/64a79279-c198-422c-862c-d4e735358ac1" /></a>
<a href="https://kaos.sh/w/fz/ci"><img src="https://kaos.sh/w/fz/ci.svg" alt="GitHub Actions CI Status" /></a>
<a href="https://kaos.sh/w/fz/codeql"><img src="https://kaos.sh/w/fz/codeql.svg" alt="GitHub Actions CodeQL Status" /></a>
<a href="https://kaos.sh/r/fz"><img src="https://kaos.sh/r/fz.svg" alt="GoReportCard" /></a>
<a href="https://kaos.sh/b/fz"><img src="https://kaos.sh/b/64a79279-c198-422c-862c-d4e735358ac1.svg" alt="Codebeat badge" /></a>
<a href="#license"><img src="https://gh.kaos.st/apache2.svg"></a>
</p>

Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions fz.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit c598bab

Please sign in to comment.