Skip to content

Commit

Permalink
chore(deps): bump go.einride.tech/sage from 0.117.0 to 0.158.0 in /.sage
Browse files Browse the repository at this point in the history
Bumps [go.einride.tech/sage](https://github.com/einride/sage) from 0.117.0 to 0.158.0.
- [Release notes](https://github.com/einride/sage/releases)
- [Commits](einride/sage@v0.117.0...v0.158.0)

---
updated-dependencies:
- dependency-name: go.einride.tech/sage
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
  • Loading branch information
dependabot[bot] authored and ericwenn committed Sep 18, 2022
1 parent 13d0c84 commit 83d1f10
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .sage/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module sage

go 1.17

require go.einride.tech/sage v0.117.0
require go.einride.tech/sage v0.158.0
4 changes: 2 additions & 2 deletions .sage/go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
go.einride.tech/sage v0.117.0 h1:5iHLwcyzCoDVovZoa1qXXBml3BsUq4sU8Lfr8dqeJw4=
go.einride.tech/sage v0.117.0/go.mod h1:EzV5uciFX7/2ho8EKB5K9JghOfXIxlzs694b+Tkl5GQ=
go.einride.tech/sage v0.158.0 h1:D0ygoEG2yQSxaI/JXICspD5w9icrxtq87HQ3lVe2EP0=
go.einride.tech/sage v0.158.0/go.mod h1:EzV5uciFX7/2ho8EKB5K9JghOfXIxlzs694b+Tkl5GQ=
36 changes: 29 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,41 @@

.DEFAULT_GOAL := all

sagefile := .sage/bin/sagefile

$(sagefile): .sage/go.mod .sage/*.go
@cd .sage && go mod tidy && go run .
cwd := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
sagefile := $(abspath $(cwd)/.sage/bin/sagefile)

# Setup Go.
go := $(shell command -v go 2>/dev/null)
export GOWORK ?= off
ifndef go
SAGE_GO_VERSION ?= 1.18.4
export GOROOT := $(abspath $(cwd)/.sage/tools/go/$(SAGE_GO_VERSION)/go)
export PATH := $(PATH):$(GOROOT)/bin
go := $(GOROOT)/bin/go
os := $(shell uname | tr '[:upper:]' '[:lower:]')
arch := $(shell uname -m)
ifeq ($(arch),x86_64)
arch := amd64
endif
$(go):
$(info installing Go $(SAGE_GO_VERSION)...)
@mkdir -p $(dir $(GOROOT))
@curl -sSL https://go.dev/dl/go$(SAGE_GO_VERSION).$(os)-$(arch).tar.gz | tar xz -C $(dir $(GOROOT))
@touch $(GOROOT)/go.mod
@chmod +x $(go)
endif

.PHONY: $(sagefile)
$(sagefile): $(go)
@cd .sage && $(go) mod tidy && $(go) run .

.PHONY: sage
sage:
@git clean -fxq $(sagefile)
@$(MAKE) $(sagefile)

.PHONY: update-sage
update-sage:
@cd .sage && go get -d go.einride.tech/sage@latest && go mod tidy && go run .
update-sage: $(go)
@cd .sage && $(go) get -d go.einride.tech/sage@latest && $(go) mod tidy && $(go) run .

.PHONY: clean-sage
clean-sage:
Expand Down
6 changes: 4 additions & 2 deletions cloudclient/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@ func (c *Config) AsServiceConfigJSON() string {
)
}
}
_ = json.NewEncoder(&s).Encode(serviceConfigJSON{
if err := json.NewEncoder(&s).Encode(serviceConfigJSON{
MethodConfig: []methodConfigJSON{methodConfig},
})
}); err != nil {
panic(err)
}
return strings.TrimSpace(s.String())
}
2 changes: 1 addition & 1 deletion cloudconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
)

// envPrefix can be set during build-time to append a prefix to all environment variables loaded into the RunConfig.
// nolint: gochecknoglobals
//nolint: gochecknoglobals
var envPrefix string

// New creates a new Config with the provided name, specification and options.
Expand Down
1 change: 1 addition & 0 deletions cloudmux/mux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ func newTestFixture(t *testing.T) *testFixture {
grpcH := &grpcServer{}
helloworld.RegisterGreeterServer(grpcS, grpcH)
httpH := &httpServer{}
//nolint: gosec
httpS := &http.Server{Handler: httpH}

return &testFixture{
Expand Down
2 changes: 1 addition & 1 deletion cloudprofiler/profiler.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
)

// shims for unit testing.
// nolint: gochecknoglobals
//nolint: gochecknoglobals
var (
profilerStart = profiler.Start
)
Expand Down
2 changes: 1 addition & 1 deletion cloudruntime/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

// shims for unit testing.
// nolint: gochecknoglobals
//nolint: gochecknoglobals
var (
metadataOnGCE = metadata.OnGCE
metadataProjectID = metadata.ProjectID
Expand Down
2 changes: 1 addition & 1 deletion cloudruntime/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"runtime/debug"
)

// nolint: gochecknoglobals
//nolint: gochecknoglobals
var serviceVersion string

// ServiceVersionFromLinkerFlags returns the exact value of the variable:
Expand Down

0 comments on commit 83d1f10

Please sign in to comment.