diff --git a/.circleci/config.yml b/.circleci/config.yml index 20b8538f7..81573eace 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -84,6 +84,10 @@ jobs: <<: *ENVIRONMENT steps: - checkout + - run: + name: Check go version + command: | + . ./go-version.sh - run: name: Install gotestsum command: | diff --git a/go-version.sh b/go-version.sh new file mode 100755 index 000000000..f877d4ce5 --- /dev/null +++ b/go-version.sh @@ -0,0 +1,7 @@ +#!/bin/bash +GO_VERSION=$(go version) + +if [[ $GO_VERSION != *"go1.14"* ]]; then + echo "Go version is not compatible" + exit 1 +fi \ No newline at end of file diff --git a/pkg/formula/default_runner.go b/pkg/formula/default_runner.go index d72963ccc..392749cd7 100644 --- a/pkg/formula/default_runner.go +++ b/pkg/formula/default_runner.go @@ -1,7 +1,6 @@ package formula import ( - "fmt" "os" "os/exec" @@ -29,9 +28,6 @@ func (d DefaultRunner) Run(def Definition, inputType api.TermInputType) error { cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr - ePwd := fmt.Sprintf(EnvPattern, PwdEnv, setup.pwd) - cmd.Env = append(cmd.Env, ePwd) - if err := d.Inputs(cmd, setup, inputType); err != nil { return err } diff --git a/pkg/formula/docker_runner.go b/pkg/formula/docker_runner.go index e79c0098a..10346c88b 100644 --- a/pkg/formula/docker_runner.go +++ b/pkg/formula/docker_runner.go @@ -9,11 +9,13 @@ import ( "github.com/ZupIT/ritchie-cli/pkg/file/fileutil" ) -const docker = "docker" -const dockerBuildCmd = "build" -const dockerRunCmd = "run" -const dockerRemoveCmd = "rm" -const envFile = ".env" +const ( + docker = "docker" + dockerBuildCmd = "build" + dockerRunCmd = "run" + dockerRemoveCmd = "rm" + envFile = ".env" +) type DockerRunner struct { PreRunner @@ -44,7 +46,7 @@ func (d DockerRunner) Run(def Definition, inputType api.TermInputType) error { for _, e := range cmd.Env { // Create a file named .env and add the environment variable inName=inValue if !fileutil.Exists(envFile) { - if err := fileutil.WriteFile(envFile, []byte(e+ "\n")); err != nil { + if err := fileutil.WriteFile(envFile, []byte(e+"\n")); err != nil { return err } continue