Commit 21759a2

committed

Merge branch 'update-go-1.18' into 'master'

chore(engine): update Go to 1.18 and fix linter warnings See merge request postgres-ai/database-lab!498

2 parents cfaaa95 + ecf5e04 commit 21759a2Copy full SHA for 21759a2

File tree

3 files changed

-7

lines changed

engine
- .gitlab-ci.yml
- Makefile
- cmd/cli/commands/config
  - environment.go

3 files changed

-7

lines changed

`‎engine/.gitlab-ci.yml‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`default:`
`2`		`- image: golang:1.17`
	`2`	`+ image: golang:1.18`
`3`	`3`
`4`	`4`	`stages:`
`5`	`5`	`- test`
`@@ -56,7 +56,7 @@ lint:`
`56`	`56`	`### Build binary.`
`57`	`57`	`build-binary-alpine:`
`58`	`58`	`<<: *only_engine`
`59`		`- image: golang:1.17-alpine`
	`59`	`+ image: golang:1.18-alpine`
`60`	`60`	`stage: build-binary`
`61`	`61`	`artifacts:`
`62`	`62`	`paths:`

`‎engine/Makefile‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ help: ## Display the help message`
`32`	`32`	`all: clean build ## Build all binary components of the project`
`33`	`33`
`34`	`34`	`install-lint: ## Install the linter to $GOPATH/bin which is expected to be in $PATH`
`35`		`- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \| sh -s -- -b $(go env GOPATH)/bin v1.42.1`
	`35`	`+ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \| sh -s -- -b $(go env GOPATH)/bin v1.45.0`
`36`	`36`
`37`	`37`	`run-lint: ## Run linters`
`38`	`38`	`golangci-lint run`

`‎engine/cmd/cli/commands/config/environment.go‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func AddEnvironmentToConfig(c cli.Context, cfg CLIConfig, environmentID string`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if _, ok := cfg.Environments[environmentID]; ok {`
`50`		`- return errors.Errorf("Environment %q is already initialized.", environmentID)`
	`50`	`+ return errors.Errorf("environment %q is already initialized", environmentID)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`env := Environment{`
`@@ -80,7 +80,7 @@ func updateEnvironmentInConfig(c cli.Context, cfg CLIConfig, environmentID str`
`80`	`80`
`81`	`81`	`environment, ok := cfg.Environments[environmentID]`
`82`	`82`	`if !ok {`
`83`		`- return errors.Errorf("Environment %q not found.", environmentID)`
	`83`	`+ return errors.Errorf("environment %q not found", environmentID)`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`if c.NumFlags() == 0 {`
`@@ -135,7 +135,7 @@ func switchToEnvironment(cfg *CLIConfig, environmentID string) error {`
`135`	`135`
`136`	`136`	`_, ok := cfg.Environments[environmentID]`
`137`	`137`	`if !ok {`
`138`		`- return errors.Errorf("Environment %q not found.", environmentID)`
	`138`	`+ return errors.Errorf("environment %q not found", environmentID)`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`cfg.CurrentEnvironment = environmentID`
`@@ -151,7 +151,7 @@ func removeByID(cfg *CLIConfig, environmentID string) error {`
`151`	`151`
`152`	`152`	`_, ok := cfg.Environments[environmentID]`
`153`	`153`	`if !ok {`
`154`		`- return errors.Errorf("Environment %q not found.", environmentID)`
	`154`	`+ return errors.Errorf("environment %q not found", environmentID)`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`delete(cfg.Environments, environmentID)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 21759a2

File tree

3 files changed

3 files changed

`‎engine/.gitlab-ci.yml‎`

`‎engine/Makefile‎`

`‎engine/cmd/cli/commands/config/environment.go‎`

0 commit comments