Skip to content

Commit

Permalink
Comment out part of script that is likely only needed on first run
Browse files Browse the repository at this point in the history
  • Loading branch information
KnVerey committed Jun 30, 2021
1 parent b465c20 commit e583f19
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions kyaml/internal/forked/update-go-yaml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,9 @@ find kyaml/internal/forked/github.com/go-yaml/yaml -name "*.go" -type f | xargs
rm kyaml/internal/forked/github.com/go-yaml/yaml/go.mod
git commit --all -m "Internalize forked code"

explain "Cherry-picking the commits from our test fixes in Kustomize PR"
cherry-pick https://github.com/kubernetes-sigs/kustomize $KUSTOMIZE_PR
# This is only necessary in the initial forking of the code
# explain "Cherry-picking the commits from our test fixes in Kustomize PR"
# cherry-pick https://github.com/kubernetes-sigs/kustomize $KUSTOMIZE_PR

explain "SUCCEEDED."
exit 0
1 change: 1 addition & 0 deletions kyaml/yaml/alias.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ type Node = yaml.Node
type Style = yaml.Style
type TypeError = yaml.TypeError
type Unmarshaler = yaml.Unmarshaler

var Marshal = func(in interface{}) ([]byte, error) {
var buf bytes.Buffer
err := NewEncoder(&buf).Encode(in)
Expand Down

0 comments on commit e583f19

Please sign in to comment.