diff --git a/chart-sync/Makefile b/chart-sync/Makefile index ac7862f4e..3e0c99669 100644 --- a/chart-sync/Makefile +++ b/chart-sync/Makefile @@ -37,7 +37,6 @@ docker-build-push: docker-build-image docker push ${REGISTRY}/chart-sync:${TAG} dep-update-oss: - go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) \ - -replace=github.com/devtron-labs/chart-sync=github.com/devtron-labs/devtron-services/chart-sync@$(TARGET_BRANCH) + go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) go mod tidy go mod vendor diff --git a/chart-sync/go.mod b/chart-sync/go.mod index 84aa7ccc5..9f01f923e 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -122,6 +122,4 @@ require ( sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.3.0 // indirect -) - -replace github.com/devtron-labs/chart-sync => github.com/devtron-labs/devtron-services/chart-sync v0.0.0-20241024131256-7d3ba621dece +) \ No newline at end of file diff --git a/ci-runner/Makefile b/ci-runner/Makefile index 1f1031acc..cd8071d1e 100644 --- a/ci-runner/Makefile +++ b/ci-runner/Makefile @@ -32,7 +32,6 @@ docker-build-push: docker-build-image dep-update-oss: - go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) \ - -replace=github.com/devtron-labs/ci-runner=github.com/devtron-labs/devtron-services/ci-runner@$(TARGET_BRANCH) + go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) go mod tidy go mod vendor \ No newline at end of file diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 1a436c250..1b450085e 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -125,6 +125,4 @@ require ( sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.3.0 // indirect -) - -replace github.com/devtron-labs/ci-runner => github.com/devtron-labs/devtron-services/ci-runner v0.0.0-20241024131256-7d3ba621dece +) \ No newline at end of file diff --git a/git-sensor/Makefile b/git-sensor/Makefile index 3761c38ed..f3f8589ce 100644 --- a/git-sensor/Makefile +++ b/git-sensor/Makefile @@ -38,8 +38,7 @@ run: build # docker push ${REGISTRY}/orchestrator:${TAG} dep-update-oss: - go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) \ - -replace=github.com/devtron-labs/git-sensor=github.com/devtron-labs/devtron-services/git-sensor@$(TARGET_BRANCH) + go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) go mod tidy go mod vendor diff --git a/git-sensor/go.mod b/git-sensor/go.mod index 239bf2cc2..ad585bab4 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -87,6 +87,4 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect mellium.im/sasl v0.3.1 // indirect -) - -replace github.com/devtron-labs/git-sensor => github.com/devtron-labs/devtron-services/git-sensor v0.0.0-20241024131256-7d3ba621dece +) \ No newline at end of file diff --git a/kubelink/Makefile b/kubelink/Makefile index e0af129e9..f4ca41fac 100644 --- a/kubelink/Makefile +++ b/kubelink/Makefile @@ -28,8 +28,7 @@ run: build ./kubelink dep-update-oss: - go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) \ - -replace=github.com/devtron-labs/kubelink=github.com/devtron-labs/devtron-services/kubelink@$(TARGET_BRANCH) + go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) go mod tidy go mod vendor diff --git a/kubelink/go.mod b/kubelink/go.mod index c7b4a0499..cf5713a06 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -207,6 +207,4 @@ replace ( k8s.io/mount-utils => k8s.io/mount-utils v0.25.0 k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.0 k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.0 -) - -replace github.com/devtron-labs/kubelink => github.com/devtron-labs/devtron-services/kubelink v0.0.0-20241024131256-7d3ba621dece +) \ No newline at end of file