Fix build issue

wso2 · Dec 13, 2023 · 9fce637 · 9fce637
1 parent d69bbf5
commit 9fce637
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 48 deletions.
diff --git a/adapter/build.gradle b/adapter/build.gradle
@@ -65,35 +65,9 @@ tasks.register('go_test', Exec) {
 tasks.named('go_revive_run').configure { 
     finalizedBy go_tidy
     finalizedBy go_test
-    finalizedBy add_crds_helm
-    dependsOn operator_make
-    dependsOn operator_make_manifests
-}
-
-tasks.register('operator_make', Exec) {
-    println("Running make -C $rootDir/../adapter/internal/operator")
-    group 'go'
-    description 'Running go mod tidy.'
-    commandLine 'make', '-C', "$rootDir/../adapter/internal/operator"
-    finalizedBy operator_make_manifests
-}
-
-tasks.register('operator_make_manifests', Exec) {
-    group 'go'
-    description 'Running go mod tidy.'
-    commandLine 'make', 'manifests', '-C', "$rootDir/../adapter/internal/operator"
-    dependsOn operator_make
-    finalizedBy go_build
-}
-
-tasks.register('add_crds_helm', Exec) {
-    group 'go'
-    description 'copy new CRD changes to helm chart'
-    commandLine 'cp','-r', "$rootDir/../adapter/internal/operator/config/crd/bases/", "$rootDir/../helm-charts/crds"
 }
 
 tasks.named('go_build').configure {
-    dependsOn operator_make_manifests
     dependsOn go_revive_run
     dependsOn go_vet
     println("Running go build")

diff --git a/common-controller/build.gradle b/common-controller/build.gradle
@@ -66,28 +66,9 @@ tasks.register('go_test', Exec) {
 tasks.named('go_revive_run').configure { 
     finalizedBy go_tidy
     finalizedBy go_test
-    dependsOn operator_make
-    dependsOn operator_make_manifests
-}
-
-tasks.register('operator_make', Exec) {
-    println("Running make -C $rootDir/../common-controller/internal/operator")
-    group 'go'
-    description 'Running go mod tidy.'
-    commandLine 'make', '-C', "$rootDir/../common-controller/internal/operator"
-    finalizedBy operator_make_manifests
-}
-
-tasks.register('operator_make_manifests', Exec) {
-    group 'go'
-    description 'Running go mod tidy.'
-    commandLine 'make', 'manifests', '-C', "$rootDir/../common-controller/internal/operator"
-    dependsOn operator_make
-    finalizedBy go_build
 }
 
 tasks.named('go_build').configure {
-    dependsOn operator_make_manifests
     dependsOn go_revive_run
     dependsOn go_vet
     println("Running go build")

diff --git a/common-controller/go.mod b/common-controller/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/pelletier/go-toml v1.9.5
 	github.com/redis/go-redis/v9 v9.2.1
 	github.com/wso2/apk/adapter v0.0.0-20231207051518-6dd728943082
-	github.com/wso2/apk/common-go-libs v0.0.0-20231207144612-d6543db1d9ad
+	github.com/wso2/apk/common-go-libs v0.0.0-20231208100153-24bee7b4bd81
 	google.golang.org/grpc v1.58.3
 )
 

diff --git a/common-controller/go.sum b/common-controller/go.sum
@@ -192,8 +192,8 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/wso2/apk/common-go-libs v0.0.0-20231207144612-d6543db1d9ad h1:QX1W+n9VJ0mzbC5mV5F4I861VJU1hZ5gYXj4D1itQXA=
-github.com/wso2/apk/common-go-libs v0.0.0-20231207144612-d6543db1d9ad/go.mod h1:fvkFU/8JJpx4Pem9srTjWmD3c89AKsyRpLyNPdQriDc=
+github.com/wso2/apk/common-go-libs v0.0.0-20231208100153-24bee7b4bd81 h1:Iobh0zi81XVNjC8dCckNWvr5VkpDwHlbJWq5jmOZtww=
+github.com/wso2/apk/common-go-libs v0.0.0-20231208100153-24bee7b4bd81/go.mod h1:fvkFU/8JJpx4Pem9srTjWmD3c89AKsyRpLyNPdQriDc=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=