Merge pull request nephio-project#88 from Nordix/pin_porch_versions

Pin porch module versions
Nordix · Jul 24, 2024 · 23d62c2 · 23d62c2
2 parents c4b36b7 + 85cfc87
commit 23d62c2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/controllers/go.mod b/controllers/go.mod
@@ -2,15 +2,11 @@ module github.com/nephio-project/porch/controllers
 
 go 1.22
 
-replace (
-	github.com/go-git/go-git/v5 v5.4.3-0.20220408232334-4f916225cb2f => github.com/platkrm/go-git/v5 v5.4.3-0.20220410165046-c76b262044ce
-	github.com/nephio-project/porch => ../
-	github.com/nephio-project/porch/api => ../api
-)
-
 require (
 	github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20230427202446-3255accc518d
 	github.com/google/cel-go v0.17.7
+	github.com/nephio-project/porch v0.0.0-20240722132258-c4b36b7a5fb1
+	github.com/nephio-project/porch/api v0.0.0-20240722132258-c4b36b7a5fb1
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/exp v0.0.0-20220916125017-b168a2c6b86b
 	golang.org/x/mod v0.16.0
@@ -25,11 +21,6 @@ require (
 	sigs.k8s.io/yaml v1.4.0
 )
 
-require (
-	github.com/nephio-project/porch v0.0.0-00010101000000-000000000000
-	github.com/nephio-project/porch/api v0.0.0-00010101000000-000000000000
-)
-
 require (
 	cloud.google.com/go/compute v1.23.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect

diff --git a/controllers/go.sum b/controllers/go.sum
@@ -161,6 +161,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/nephio-project/porch v0.0.0-20240722132258-c4b36b7a5fb1 h1:4tHNjScfFfVBL0Yv2GiEekbVd8QnjFKLmRTaIFe1RVI=
+github.com/nephio-project/porch v0.0.0-20240722132258-c4b36b7a5fb1/go.mod h1:vXr8T1zGo9Pb79zzTlb23UzKnPqmDrm59BL3FcHXwPg=
+github.com/nephio-project/porch/api v0.0.0-20240722132258-c4b36b7a5fb1 h1:/eKsBYxcv7VJBGxzezee34JuX5P0dhcxYCumiY5IL04=
+github.com/nephio-project/porch/api v0.0.0-20240722132258-c4b36b7a5fb1/go.mod h1:qHyDwqL9NeZwbkZkqaZGjJ12OjEId57Fbwhwbf+ufdE=
 github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY=
 github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw=
 github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=

diff --git a/go.mod b/go.mod
@@ -2,8 +2,6 @@ module github.com/nephio-project/porch
 
 go 1.22
 
-replace github.com/nephio-project/porch/api => ./api
-
 require (
 	cloud.google.com/go/iam v1.1.1
 	github.com/GoogleContainerTools/kpt v1.0.0-beta.48
@@ -25,7 +23,7 @@ require (
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/google/uuid v1.6.0
 	github.com/hexops/gotextdiff v1.0.3
-	github.com/nephio-project/porch/api v0.0.0-00010101000000-000000000000
+	github.com/nephio-project/porch/api v0.0.0-20240722132258-c4b36b7a5fb1
 	github.com/otiai10/copy v1.7.0
 	github.com/philopon/go-toposort v0.0.0-20170620085441-9be86dbd762f
 	github.com/prep/wasmexec v0.0.0-20220807105708-6554945c1dec

diff --git a/go.sum b/go.sum
@@ -352,6 +352,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/nephio-project/porch/api v0.0.0-20240722132258-c4b36b7a5fb1 h1:/eKsBYxcv7VJBGxzezee34JuX5P0dhcxYCumiY5IL04=
+github.com/nephio-project/porch/api v0.0.0-20240722132258-c4b36b7a5fb1/go.mod h1:qHyDwqL9NeZwbkZkqaZGjJ12OjEId57Fbwhwbf+ufdE=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c h1:Hww8mOyEKTeON4bZn7FrlLismspbPc1teNRUVH7wLQ8=