Merge branch 'main' into feat/sdk-v0.50

ignite · Oct 18, 2023 · 34d807c · 34d807c
2 parents 8b5f007 + 4739faf
commit 34d807c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -43,22 +43,17 @@ jobs:
             go.sum
             **/testdata/**
 
-      - uses: actions/cache@v3
-        if: env.GIT_DIFF
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
       - uses: actions/setup-go@v4
         if: env.GIT_DIFF
         with:
-          go-version: '1.21'
+          go-version: 'stable'
+
       - name: Run Integration Tests
         if: env.GIT_DIFF
-        run: GOSUMDB=off go test -v -timeout 120m ./integration/${{ matrix.test-path }}
+        env:
+          GOTOOLCHAIN: local+path
+          GOSUMDB: off
+        run: go test -v -timeout 120m ./integration/${{ matrix.test-path }}
 
   status:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/test-lint.yml b/.github/workflows/test-lint.yml
@@ -25,10 +25,13 @@ jobs:
             **/*.go
             go.mod
             go.sum
+
       - uses: actions/setup-go@v4
         if: env.GIT_DIFF
         with:
           go-version-file: go.mod
+          cache: false
+
       - uses: golangci/golangci-lint-action@v3
         if: env.GIT_DIFF
         with:

diff --git a/changelog.md b/changelog.md
@@ -12,6 +12,7 @@
 
 ### Changes
 
+- [#3701](https://github.com/ignite/cli/pull/3701) Bump `go` version to 1.21
 - [#3621](https://github.com/ignite/cli/pull/3621) Change `pkg/availableport` to allow custom parameters in `Find` function and handle duplicated ports
 - [#3559](https://github.com/ignite/cli/pull/3559) Bump network plugin version to `v0.1.1`
 - [#3581](https://github.com/ignite/cli/pull/3581) Bump cometbft and cometbft-db in the template

diff --git a/ignite/pkg/cache/cache.go b/ignite/pkg/cache/cache.go
@@ -94,7 +94,7 @@ func (c Cache[T]) Put(key string, value T) error {
 func (c Cache[T]) Get(key string) (val T, err error) {
 	db, err := openDB(c.storage.storagePath)
 	if err != nil {
-		return
+		return val, err
 	}
 	defer db.Close()
 

diff --git a/ignite/pkg/placeholder/error.go b/ignite/pkg/placeholder/error.go
@@ -1,6 +1,7 @@
 package placeholder
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 
@@ -18,8 +19,8 @@ type MissingPlaceholdersError struct {
 
 // Is true if both errors have the same list of missing placeholders.
 func (e *MissingPlaceholdersError) Is(err error) bool {
-	other, ok := err.(*MissingPlaceholdersError) //nolint:errorlint
-	if !ok {
+	var other *MissingPlaceholdersError
+	if !errors.As(err, &other) {
 		return false
 	}
 	if len(other.missing) != len(e.missing) {

diff --git a/ignite/services/plugin/template/go.mod.plush b/ignite/services/plugin/template/go.mod.plush
@@ -1,6 +1,6 @@
 module <%= ModuleName %>
 
-go 1.20
+go 1.21
 
 require (
 	github.com/hashicorp/go-plugin v1.5.0