From 6a267b8d92cdbe989d7f9479ffa94c9d70b8232a Mon Sep 17 00:00:00 2001 From: John Muchovej Date: Sat, 29 Feb 2020 20:12:23 -0500 Subject: Removing darwin/386/1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Is there a need to bother building for 386? If memory serves, Apple has even dropped 32-bit support. Honestly not sure how much time it saves on builds, but figured it's best to trim out what's not really needed. 😅 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca4c3b9..6616feb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,4 +12,4 @@ jobs: - name: Compile uses: xxxserxxx/actions/golang-build@master with: - args: darwin/amd64/1 darwin/386/1 linux/amd64 linux/386 linux/arm64 linux/arm7 linux/arm6 linux/arm5 windows/amd64 windows/386 freebsd/amd64 freebsd/386 + args: darwin/amd64/1 linux/amd64 linux/386 linux/arm64 linux/arm7 linux/arm6 linux/arm5 windows/amd64 windows/386 freebsd/amd64 freebsd/386 -- cgit v1.2.3 From 17df8b25a9a337a3b39268cf759d277f6fa17671 Mon Sep 17 00:00:00 2001 From: John Muchovej Date: Sat, 29 Feb 2020 20:13:57 -0500 Subject: Remove darwin/386/1 Similar rationale as with `build.yml` --- .github/workflows/prerelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index c7a8594..e060746 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -16,7 +16,7 @@ jobs: - name: Make binaries uses: xxxserxxx/actions/golang-build@master with: - args: darwin/amd64/1 darwin/386/1 linux/amd64 linux/386 linux/arm64 linux/arm7 linux/arm6 linux/arm5 windows/amd64 windows/386 freebsd/amd64 freebsd/386 + args: darwin/amd64/1 linux/amd64 linux/386 linux/arm64 linux/arm7 linux/arm6 linux/arm5 windows/amd64 windows/386 freebsd/amd64 freebsd/386 env: COMPRESS_FILES: true -- cgit v1.2.3 From 8bd1108311a51517c8ee425550ecdb1a917de9c3 Mon Sep 17 00:00:00 2001 From: MaxSem Date: Tue, 3 Mar 2020 11:21:59 +0300 Subject: Fix typo in bug report template --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6c1ca65..2ad7ea1 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -11,7 +11,7 @@ Required information: - gotop version (`gotop -V`): - The output of `uname -a`: - Terminal emulator (e.g. iTerm or gnome terminal): -- Any relevenat hardware info: +- Any relevant hardware info: - tmux version if using tmux: Also please copy or attach `~/.local/state/gotop/errors.log` if it exists and contains logs: -- cgit v1.2.3 From 120f9f291ed81a925a603581105c4bbe3d84bf8a Mon Sep 17 00:00:00 2001 From: xxxserxxx <60757196+xxxserxxx@users.noreply.github.com> Date: Tue, 3 Mar 2020 06:15:40 -0600 Subject: More instructions --- .github/ISSUE_TEMPLATE/bug_report.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6c1ca65..a65c874 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -6,12 +6,15 @@ about: Template to report bugs. -Required information: - -- gotop version (`gotop -V`): -- The output of `uname -a`: -- Terminal emulator (e.g. iTerm or gnome terminal): -- Any relevenat hardware info: -- tmux version if using tmux: +##### gotop version: +`gotop -V`, or if built from source, `git rev-parse HEAD` +##### OS/Arch: +Linux: `uname -or`, OSX: `sw_vers`; Windows: `systeminfo | findstr /B /C:"OS Name" /C:"OS Version"` +##### Terminal emulator: +e.g. iTerm, kitty, xterm, PowerShell +##### Any relevenat hardware info: +If the issue is clearly related to a specific piece of hardware, e.g., the network +##### tmux version: +`tmux -V`, if using tmux Also please copy or attach `~/.local/state/gotop/errors.log` if it exists and contains logs: -- cgit v1.2.3 From 4db86f0c2d9a7c2b6ce261961d2fd6aa8ec09675 Mon Sep 17 00:00:00 2001 From: "Sean E. Russell" Date: Tue, 3 Mar 2020 06:36:42 -0600 Subject: Prevent crashes on Windows from wonky CPU values #70 --- devices/cpu_cpu.go | 6 +++++- docs/releasing.md | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/devices/cpu_cpu.go b/devices/cpu_cpu.go index a1d20cd..42eff2e 100644 --- a/devices/cpu_cpu.go +++ b/devices/cpu_cpu.go @@ -23,7 +23,11 @@ func init() { } for i := 0; i < len(vals); i++ { key := fmt.Sprintf(formatString, i) - cpus[key] = int(vals[i]) + v := vals[i] + if v > 100 { + v = 100 + } + cpus[key] = int(v) } return nil } diff --git a/docs/releasing.md b/docs/releasing.md index 4c6583c..d77b6dd 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -26,3 +26,10 @@ Nix adds new and interesting complexities to the release. 6. Update the version and hash in nixpkgs/pkgs/tools/system/gotop/default.nix 8. In docker, install & run vgo2nix to update deps.nix 7. nix-build -A gotop + + +For plugin development: +``` +V=$(git show -s --format=%cI HEAD | cut -b -19 | tr -cd '[:digit:]')-$(git rev-parse HEAD | cut -b -12) +go build -ldflags "-X main.Version=$V" -o gotop ./cmd/gotop +``` -- cgit v1.2.3