Skip to content

Commit

Permalink
Bump go minimal version to 1.21
Browse files Browse the repository at this point in the history
Signed-off-by: jhrotko <[email protected]>
  • Loading branch information
jhrotko authored and glours committed Feb 7, 2024
1 parent ea7ab6f commit 7efd398
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
25 changes: 0 additions & 25 deletions override/compare.go

This file was deleted.

29 changes: 0 additions & 29 deletions override/compare120.go

This file was deleted.

3 changes: 2 additions & 1 deletion override/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package override

import (
"cmp"
"fmt"
"strings"

Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 7efd398

Please sign in to comment.