Skip to content

Commit

Permalink
Use appscode/[email protected]
Browse files Browse the repository at this point in the history
Signed-off-by: Tamal Saha <[email protected]>
  • Loading branch information
tamalsaha committed Feb 18, 2020
1 parent dced320 commit 148da01
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ BIN_PLATFORMS := $(DOCKER_PLATFORMS)
OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))

GO_VERSION ?= 1.12.9
BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION)-stretch
GO_VERSION ?= 1.13.8
BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION)

OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)
ifeq ($(OS),windows)
Expand Down
4 changes: 2 additions & 2 deletions cmds/aggregator.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ type PageInfo struct {
// Git GitInfo `json:"git"`
}

func (p PageInfo) Map(extra map[string]interface{}) (map[string]interface{}, error) {
func (p PageInfo) Map(extra map[string]string) (map[string]string, error) {
data, err := json.Marshal(p)
if err != nil {
return nil, err
}
var m map[string]interface{}
var m map[string]string
err = json.Unmarshal(data, &m)
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/appscodelabs/hugo-tools

require (
github.com/appscode/go v0.0.0-20191119085241-0887d8ec2ecc
github.com/appscode/static-assets v0.3.1
github.com/appscode/static-assets v0.4.0
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27
github.com/gohugoio/hugo v0.49.1
github.com/imdario/mergo v0.3.7
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897 h1:p9Sln00KOTlrYkx
github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
github.com/appscode/go v0.0.0-20191119085241-0887d8ec2ecc h1:Q5jwbRq/a1Tien+Is8Zn6HMBRgE13+UOQ9mTvrIuvuE=
github.com/appscode/go v0.0.0-20191119085241-0887d8ec2ecc/go.mod h1:OawnOmAL4ZX3YaPdN+8HTNwBveT1jMsqP74moa9XUbE=
github.com/appscode/static-assets v0.3.1 h1:uG3qZKGODLmFf1YC+Cw3qDoRGUmfdXFGqGZtkVJO/cw=
github.com/appscode/static-assets v0.3.1/go.mod h1:Bvk6peljX6QnzrfYfz+cetuVO+icWh/sTlkZ7gP1I/s=
github.com/appscode/static-assets v0.4.0 h1:7GM14BWNbmTEKU+ejufOOrgx6cm2GCA1CKLFwpSXqqg=
github.com/appscode/static-assets v0.4.0/go.mod h1:Bvk6peljX6QnzrfYfz+cetuVO+icWh/sTlkZ7gP1I/s=
github.com/beevik/ntp v0.2.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg=
github.com/bep/debounce v1.1.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
github.com/bep/gitmap v1.0.0/go.mod h1:g9VRETxFUXNWzMiuxOwcudo6DfZkW9jOsOW0Ft4kYaY=
Expand Down
20 changes: 12 additions & 8 deletions vendor/github.com/appscode/static-assets/api/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ github.com/alecthomas/chroma/styles
# github.com/appscode/go v0.0.0-20191119085241-0887d8ec2ecc
github.com/appscode/go/log/golog
github.com/appscode/go/runtime
# github.com/appscode/static-assets v0.3.1
# github.com/appscode/static-assets v0.4.0
github.com/appscode/static-assets/api
github.com/appscode/static-assets/hugo
# github.com/chaseadamsio/goorgeous v1.1.0
Expand Down

0 comments on commit 148da01

Please sign in to comment.