Bump go minimal version to 1.21

jhrotko · glours · commit 7efd39800312 · 2024-02-07T18:50:28.000+01:00
Signed-off-by: jhrotko &lt;joana.hrotko@docker.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: ['1.21', '1.20']
+        go-version: ['1.22', '1.21']
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 10
diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -12,7 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-FROM golang:1.20
+FROM golang:1.21
 
 WORKDIR /go/src
 
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/compose-spec/compose-go/v2
 
-go 1.20
+go 1.21
 
 require (
 	github.com/distribution/reference v0.5.0
diff --git a/override/compare.go b/override/compare.go
diff --git a/override/compare120.go b/override/compare120.go
diff --git a/override/merge.go b/override/merge.go
@@ -17,6 +17,7 @@
 package override
 
 import (
+	"cmp"
 	"fmt"
 	"strings"
 
@@ -179,7 +180,7 @@ func convertIntoSequence(value any) []any {
 			i++
 		}
 		slices.SortFunc(seq, func(a, b any) int {
-			return compare(a.(string), b.(string))
+			return cmp.Compare(a.(string), b.(string))
 		})
 		return seq
 	case []any:
