From f96a97c3d8f5b8cd87a6e2f1fd1d0a4032c429a7 Mon Sep 17 00:00:00 2001
From: "Sean E. Russell" <ser@ser1.net>
Date: Tue, 18 Feb 2020 13:27:38 -0600
Subject: Prepped for release

---
 .gitignore           | 3 +++
 CHANGELOG.md         | 9 ++++++++-
 cmd/gotop/main.go    | 2 +-
 go.sum               | 2 ++
 layouts/consume_test | 2 ++
 make.sh              | 2 +-
 6 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 layouts/consume_test

diff --git a/.gitignore b/.gitignore
index 15637d0..50cf697 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ dist/
 /*.snap
 /snap/.snapcraft/
 /*_source.tar.bz2
+
+build/gotop_*
+build.log
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32bd5e4..b028930 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 > - **Fixed**: for any bug fixes.
 > - **Security**: in case of vulnerabilities.
 
-## [3.3.0] - 
+## [3.3.1] - 2020-02-18
+
+- Fixed: Fixes a layout bug where, if columns filled up early, widgets would be
+  consumed but not displayed.
+- Fixed: Rolled back dependency update on github.com/shirou/gopsutil; the new version
+  has a bug that causes cores to not be seen.
+
+## [3.3.0] - 2020-02-17
 
 - Added: Logs are now rotated. Settings are currently hard-coded at 4 files of 5MB
   each, so logs shouldn't take up more than 20MB.  I'm going to see how many
diff --git a/cmd/gotop/main.go b/cmd/gotop/main.go
index 205a457..5a898f8 100644
--- a/cmd/gotop/main.go
+++ b/cmd/gotop/main.go
@@ -25,7 +25,7 @@ import (
 
 const (
 	appName = "gotop"
-	version = "3.3.0"
+	version = "3.3.1"
 
 	graphHorizontalScaleDelta = 3
 	defaultUI                 = "cpu\ndisk/1 2:mem/2\ntemp\nnet procs"
diff --git a/go.sum b/go.sum
index 8971155..aaabcf8 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,4 @@
+github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
@@ -32,6 +33,7 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E=
 github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
 github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
 github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
diff --git a/layouts/consume_test b/layouts/consume_test
new file mode 100644
index 0000000..0d48932
--- /dev/null
+++ b/layouts/consume_test
@@ -0,0 +1,2 @@
+5:cpu 6:procs
+mem
diff --git a/make.sh b/make.sh
index fc920f3..132657a 100755
--- a/make.sh
+++ b/make.sh
@@ -22,7 +22,6 @@ function candz() {
 		D=${D}.exe
 	fi
 	go build -o $D ./cmd/gotop >> build.log 2>&1 
-	unset GOOS GOARCH GOARM CGO_ENABLED
 	if [[ $? -ne 0 ]]; then
 		printenv | grep GO >> build.log
 		echo "############### FAILED ###############" >> build.log
@@ -31,6 +30,7 @@ function candz() {
 		echo FAILED $OUT
 		return
 	fi
+	unset GOOS GOARCH GOARM CGO_ENABLED
 	cd build
 	zip $(basename $OUT) $(basename $D) >> ../build.log 2>&1
 	cd ..
-- 
cgit v1.2.3