diff --git a/.github/workflows/main_linux.yml b/.github/workflows/main_linux.yml index 4c8ad22d..e9cbd9e1 100644 --- a/.github/workflows/main_linux.yml +++ b/.github/workflows/main_linux.yml @@ -7,7 +7,11 @@ on: - "releases/*" jobs: build-and-test: - runs-on: ubuntu-latest + # Ref: https://github.com/actions/runner-images/tree/main/images/macos + strategy: + matrix: + os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-latest ] + runs-on: ${{ matrix.os }} steps: - name: Git checkout uses: actions/checkout@v4 @@ -23,7 +27,6 @@ jobs: - name: CGO_ENABLED=1 go test run: CGO_ENABLED=1 go test ./... - # Parallel tests - run: go test -v -coverprofile=profile.cov ./... - uses: shogo82148/actions-goveralls@v1 with: diff --git a/go.mod b/go.mod index f9583da4..34622cd5 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 gopkg.in/yaml.v3 v3.0.1 - kcl-lang.io/lib v0.10.0-beta.1 + kcl-lang.io/lib v0.10.0-beta.2 ) require ( diff --git a/go.sum b/go.sum index 39cbba5d..1604481d 100644 --- a/go.sum +++ b/go.sum @@ -115,5 +115,5 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -kcl-lang.io/lib v0.10.0-beta.1 h1:VVMaYdzYXG2nnedzPeDYxwob0D1J2sbJH7zmKE4iXT4= -kcl-lang.io/lib v0.10.0-beta.1/go.mod h1:tu+tzwGgHLzYZSIxUG/ntipStrxZd6OvutWYPTxS7cs= +kcl-lang.io/lib v0.10.0-beta.2 h1:2C6flNt762+uH2GDzxxEVlG09NmWMOCedjoti0Kp4RQ= +kcl-lang.io/lib v0.10.0-beta.2/go.mod h1:tu+tzwGgHLzYZSIxUG/ntipStrxZd6OvutWYPTxS7cs= diff --git a/kcl_test.go b/kcl_test.go index e5469a49..dcf59761 100644 --- a/kcl_test.go +++ b/kcl_test.go @@ -149,6 +149,9 @@ a2 = App { defer os.Remove(testdata_main_k) kfile, err = os.Create(testdata_main_k) + if err != nil { + t.Fatal(err) + } kfile.Close() result, err = kcl.Run(testdata_main_k, @@ -186,8 +189,9 @@ a1 = App { name = "a1-app" image = "new-a1-image" } - -a2 = App {image = "new-a2-image:v123"}`) +a2 = App { + image = "new-a2-image:v123" +}`) got := strings.TrimSpace(string(data)) got = strings.ReplaceAll(got, "\r\n", "\n") diff --git a/pkg/tools/override/override_test.go b/pkg/tools/override/override_test.go index 697dd34b..d6870c2f 100644 --- a/pkg/tools/override/override_test.go +++ b/pkg/tools/override/override_test.go @@ -37,7 +37,6 @@ schema Config: if True: configOther = Config {image = "image/other:v1"} - config: Config { image = "image/image:v1" replicas: 1 diff --git a/pkg/tools/override/testdata/test.k b/pkg/tools/override/testdata/test.k index a990a992..519b2a61 100644 --- a/pkg/tools/override/testdata/test.k +++ b/pkg/tools/override/testdata/test.k @@ -7,7 +7,6 @@ schema Config: if True: configOther = Config {image = "image/other:v1"} - config: Config { image = "image/image:v1" replicas: 1