Merge pull request #142 from ninech/fix-update

fix the update command with the language
ninech · Aug 15, 2024 · 6dc848b · 6dc848b
2 parents 35a7505 + 938da9a
commit 6dc848b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: stable
+          go-version: '1.22'
       - run: git config --global url.https://[email protected]/.insteadOf https://github.com/
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: stable
+          go-version: '1.22'
       - run: git config --global url.https://[email protected]/.insteadOf https://github.com/
       - name: Get dependencies
         run: go get -v -t -d ./...

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
       - name: setup go
         uses: actions/setup-go@v5
         with:
-          go-version: stable
+          go-version: '1.22'
       - run: git config --global url.https://[email protected]/.insteadOf https://github.com/
       - name: Define goreleaser flags
         run: test -n "$(git tag --points-at HEAD)" || echo "GORELEASER_FLAGS=--snapshot" >> $GITHUB_ENV

diff --git a/api/log/client.go b/api/log/client.go
@@ -201,7 +201,7 @@ func (c *Client) TailQuery(ctx context.Context, delayFor time.Duration, out outp
 				continue
 			}
 
-			if websocket.IsCloseError(err, websocket.CloseNormalClosure) || errors.Is(websocket.ErrCloseSent, err) {
+			if websocket.IsCloseError(err, websocket.CloseNormalClosure) || errors.Is(err, websocket.ErrCloseSent) {
 				return nil
 			}
 

diff --git a/create/application.go b/create/application.go
@@ -400,7 +400,7 @@ func waitForBuildFinish(ctx context.Context, app *apps.Application, logClient *l
 
 			go func() {
 				if _, err := p.Run(); err != nil {
-					if !errors.Is(tea.ErrProgramKilled, err) {
+					if !errors.Is(err, tea.ErrProgramKilled) {
 						fmt.Fprintf(os.Stderr, "error running tea program: %s", err)
 					}
 				}

diff --git a/update/application.go b/update/application.go
@@ -38,7 +38,7 @@ type applicationCmd struct {
 	GitInformationServiceURL string            `help:"URL of the git information service." default:"https://git-info.deplo.io" env:"GIT_INFORMATION_SERVICE_URL" hidden:""`
 	SkipRepoAccessCheck      bool              `help:"Skip the git repository access check" default:"false"`
 	Debug                    bool              `help:"Enable debug messages" default:"false"`
-	Language                 *string           `help:"${app_language_help} Possible values: ${enum}" enum:"ruby,php,python,golang,nodejs,static,ruby-heroku," default:""`
+	Language                 *string           `help:"${app_language_help} Possible values: ${enum}" enum:"ruby,php,python,golang,nodejs,static,ruby-heroku,"`
 	DockerfileBuild          dockerfileBuild   `embed:""`
 }