luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #7827 from hashicorp/deps-go-msgpack-v1.1.5

Browse source 
Harmonize go-msgpack/codec/codecgen
This commit is contained in:
Mahmood Ali 2020-04-28 18:13:09 -04:00 committed by GitHub
parent 4935b304a0 18dba6fdad
commit 18ac17b189
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
GNUmakefile
View file

@ -175,11 +175,7 @@ deps: ## Install build and development dependencies
GO111MODULE=on go get -u gotest.tools/gotestsum
GO111MODULE=on go get -u github.com/fatih/hclfmt
GO111MODULE=on go get -u github.com/golang/protobuf/protoc-gen-go@v1.3.4
# The tag here must correspoond to codec version nomad uses, e.g. v1.1.5.
# Though, v1.1.5 codecgen has a bug in code generator, so using a specific sha
# here instead.
GO111MODULE=on go get -u github.com/hashicorp/go-msgpack/codec/codecgen@f51b5189210768cf0d476580cf287620374d4f02
GO111MODULE=on go get -u github.com/hashicorp/go-msgpack/codec/codecgen@v1.1.5
.PHONY: lint-deps
lint-deps: ## Install linter dependencies

6
client/structs/generate.sh
View file

@ -1,6 +0,0 @@
#!/bin/bash
set -e
codecgen -d 102 -t codegen_generated -o structs.generated.go structs.go
sed -i'' -e 's|"github.com/ugorji/go/codec|"github.com/hashicorp/go-msgpack/codec|g' structs.generated.go

2
client/structs/structs.go
View file

@ -1,6 +1,6 @@
package structs
//go:generate ./generate.sh
//go:generate codecgen -c github.com/hashicorp/go-msgpack/codec -d 102 -t codegen_generated -o structs.generated.go structs.go
import (
"errors"