In module replacements, drop specific version numbers.

This commit is contained in:
jregan
2020-12-20 16:23:23 -08:00
parent 38e9770f40
commit 338910d36c
30 changed files with 43 additions and 42 deletions

View File

@@ -25,4 +25,4 @@ require (
sigs.k8s.io/yaml v1.2.0
)
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../kyaml

View File

@@ -18,4 +18,4 @@ require (
sigs.k8s.io/kustomize/kyaml v0.10.3
)
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../../kyaml

View File

@@ -66,8 +66,9 @@ func (e *Editor) Pin(target misc.LaModule, oldV, newV semver.SemVer) error {
func (e *Editor) UnPin(target misc.LaModule, oldV semver.SemVer) error {
var r strings.Builder
r.WriteString(target.ImportPath())
r.WriteString("@")
r.WriteString(oldV.String())
// Don't specify the old version.
// r.WriteString("@")
// r.WriteString(oldV.String())
r.WriteString("=")
r.WriteString(upstairs(e.module.ShortName().Depth()))
r.WriteString(string(target.ShortName()))

View File

@@ -11,6 +11,6 @@ require (
sigs.k8s.io/yaml v1.2.0
)
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../api
replace sigs.k8s.io/kustomize/api => ../../api
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../../kyaml

View File

@@ -20,6 +20,6 @@ exclude (
sigs.k8s.io/kustomize/cmd/config v0.2.0
)
replace sigs.k8s.io/kustomize/api v0.7.0 => ../api
replace sigs.k8s.io/kustomize/api => ../api
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../kyaml

View File

@@ -8,6 +8,6 @@ require (
sigs.k8s.io/yaml v1.2.0
)
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml

View File

@@ -9,4 +9,4 @@ require (
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api

View File

@@ -6,4 +6,4 @@ require sigs.k8s.io/kustomize/api v0.7.0
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api

View File

@@ -9,4 +9,4 @@ require (
sigs.k8s.io/yaml v1.2.0
)
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api

View File

@@ -8,6 +8,6 @@ require (
sigs.k8s.io/yaml v1.2.0
)
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml

View File

@@ -8,6 +8,6 @@ require (
sigs.k8s.io/yaml v1.2.0
)
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml

View File

@@ -9,4 +9,4 @@ require (
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api

View File

@@ -8,6 +8,6 @@ require (
sigs.k8s.io/yaml v1.2.0
)
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml

View File

@@ -10,6 +10,6 @@ require (
sigs.k8s.io/yaml v1.2.0
)
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml

View File

@@ -10,4 +10,4 @@ require (
replace sigs.k8s.io/kustomize/kyaml v0.9.4 => ../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api

View File

@@ -9,6 +9,6 @@ require (
sigs.k8s.io/yaml v1.2.0
)
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml

View File

@@ -8,6 +8,6 @@ require (
sigs.k8s.io/yaml v1.2.0
)
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml

View File

@@ -8,6 +8,6 @@ require (
sigs.k8s.io/yaml v1.2.0
)
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml

View File

@@ -9,4 +9,4 @@ require (
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api

View File

@@ -8,6 +8,6 @@ require (
sigs.k8s.io/yaml v1.2.0
)
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api
replace sigs.k8s.io/kustomize/api => ../../../api
replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml
replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml

View File

@@ -6,4 +6,4 @@ require sigs.k8s.io/kustomize/api v0.7.0
replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api
replace sigs.k8s.io/kustomize/api => ../../../../api

View File

@@ -10,4 +10,4 @@ require (
replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api
replace sigs.k8s.io/kustomize/api => ../../../../api

View File

@@ -6,4 +6,4 @@ require sigs.k8s.io/kustomize/api v0.7.0
replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api
replace sigs.k8s.io/kustomize/api => ../../../../api

View File

@@ -9,4 +9,4 @@ require (
replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api
replace sigs.k8s.io/kustomize/api => ../../../../api

View File

@@ -6,4 +6,4 @@ require sigs.k8s.io/kustomize/api v0.7.0
replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api
replace sigs.k8s.io/kustomize/api => ../../../../api

View File

@@ -9,4 +9,4 @@ require (
replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api
replace sigs.k8s.io/kustomize/api => ../../../../api

View File

@@ -10,4 +10,4 @@ require (
replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api
replace sigs.k8s.io/kustomize/api => ../../../../api

View File

@@ -6,4 +6,4 @@ require sigs.k8s.io/kustomize/api v0.7.0
replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api
replace sigs.k8s.io/kustomize/api => ../../../../api

View File

@@ -4,4 +4,4 @@ go 1.15
require sigs.k8s.io/kustomize/api v0.7.0
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api
replace sigs.k8s.io/kustomize/api => ../../../../api

View File

@@ -9,4 +9,4 @@ require (
replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml
replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api
replace sigs.k8s.io/kustomize/api => ../../../../api