From fb04cb1fcd9869f19d01a4129785bfda811cb86d Mon Sep 17 00:00:00 2001 From: Chris Lane Date: Thu, 14 May 2020 20:02:35 -0400 Subject: [PATCH] feat(makefile): support 32-bit systems - Update the `Makefile` to additionally output a 386 binary (#562) - Update the dependencies (#561) - Bump version --- Makefile | 6 ++++++ cmd/cheat/main.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- vendor/gopkg.in/yaml.v2/apic.go | 1 + vendor/modules.txt | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index fa652a6..ae279ad 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ TMPDIR := /tmp # release binaries releases := \ $(dist_dir)/cheat-darwin-amd64 \ + $(dist_dir)/cheat-linux-386 \ $(dist_dir)/cheat-linux-amd64 \ $(dist_dir)/cheat-linux-arm5 \ $(dist_dir)/cheat-linux-arm6 \ @@ -52,6 +53,11 @@ $(dist_dir)/cheat-darwin-amd64: prepare GOARCH=amd64 GOOS=darwin \ $(GO) build $(BUILD_FLAGS) -o $@ $(cmd_dir) && $(GZIP) $@ && chmod -x $@.gz +# cheat-linux-386 +$(dist_dir)/cheat-linux-386: prepare + GOARCH=386 GOOS=linux \ + $(GO) build $(BUILD_FLAGS) -o $@ $(cmd_dir) && $(GZIP) $@ && chmod -x $@.gz + # cheat-linux-amd64 $(dist_dir)/cheat-linux-amd64: prepare GOARCH=amd64 GOOS=linux \ diff --git a/cmd/cheat/main.go b/cmd/cheat/main.go index cc1732e..f9c724e 100755 --- a/cmd/cheat/main.go +++ b/cmd/cheat/main.go @@ -17,7 +17,7 @@ import ( "github.com/cheat/cheat/internal/installer" ) -const version = "3.10.0" +const version = "3.10.1" func main() { diff --git a/go.mod b/go.mod index bc6085d..28acd59 100644 --- a/go.mod +++ b/go.mod @@ -13,5 +13,5 @@ require ( github.com/sergi/go-diff v1.1.0 // indirect gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 - gopkg.in/yaml.v2 v2.2.8 + gopkg.in/yaml.v2 v2.3.0 ) diff --git a/go.sum b/go.sum index d8fc804..0a172bc 100644 --- a/go.sum +++ b/go.sum @@ -60,5 +60,5 @@ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+p gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/gopkg.in/yaml.v2/apic.go b/vendor/gopkg.in/yaml.v2/apic.go index 1f7e87e..d2c2308 100644 --- a/vendor/gopkg.in/yaml.v2/apic.go +++ b/vendor/gopkg.in/yaml.v2/apic.go @@ -86,6 +86,7 @@ func yaml_emitter_initialize(emitter *yaml_emitter_t) { raw_buffer: make([]byte, 0, output_raw_buffer_size), states: make([]yaml_emitter_state_t, 0, initial_stack_size), events: make([]yaml_event_t, 0, initial_queue_size), + best_width: -1, } } diff --git a/vendor/modules.txt b/vendor/modules.txt index f8486b0..4a43f22 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -63,6 +63,6 @@ golang.org/x/sys/unix # gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 ## explicit gopkg.in/yaml.v1 -# gopkg.in/yaml.v2 v2.2.8 +# gopkg.in/yaml.v2 v2.3.0 ## explicit gopkg.in/yaml.v2