This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
recursive-delete-patterns: | |
- BUILD | |
- "*/BUILD" | |
- BUILD.bazel | |
- "*/BUILD.bazel" | |
- Gopkg.toml | |
rules: | |
- destination: apimachinery | |
library: true | |
branches: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
recursive-delete-patterns: | |
- BUILD | |
- "*/BUILD" | |
- BUILD.bazel | |
- "*/BUILD.bazel" | |
- Gopkg.toml | |
rules: | |
- destination: code-generator | |
branches: | |
- source: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash -ex | |
cd $GOPATH/src/k8s.io | |
rm -rf cache.new | |
if [ ! -d cache ]; then | |
mkdir cache.new | |
pushd cache.new | |
for repo in $(ls -1 ../kubernetes/staging/src/k8s.io); do | |
git clone https://github.com/kubernetes/${repo}.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash -ex | |
cd $GOPATH/src/k8s.io | |
rm -rf cache.new | |
if [ ! -d cache ]; then | |
mkdir cache.new | |
pushd cache.new | |
for repo in $(ls -1 ../kubernetes/staging/src/k8s.io); do | |
git clone https://github.com/kubernetes/${repo}.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash -ex | |
cd $GOPATH/src/k8s.io | |
rm -rf cache.new | |
if [ ! -d cache ]; then | |
mkdir cache.new | |
pushd cache.new | |
for repo in $(ls -1 ../kubernetes/staging/src/k8s.io); do | |
git clone https://github.com/kubernetes/${repo}.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[merge] | |
tool = mymeld | |
conflictstyle = diff3 | |
[mergetool "mymeld"] | |
# Shows three-pane merge view with central output directly being the merged file to save | |
cmd = $MANISHMELD $LOCAL $BASE $REMOTE --output=$MERGED | |
#cmd = meld "$LOCAL" "$BASE" "$REMOTE" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash -ex | |
cd $GOPATH/src/k8s.io | |
rm -rf cache.new | |
if [ ! -d cache ]; then | |
mkdir cache.new | |
pushd cache.new | |
for repo in $(ls -1 ../kubernetes/staging/src/k8s.io); do | |
git clone https://github.com/kubernetes/${repo}.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/artifacts/scripts/util.sh b/artifacts/scripts/util.sh | |
index e9e3d01..7875b46 100755 | |
--- a/artifacts/scripts/util.sh | |
+++ b/artifacts/scripts/util.sh | |
@@ -380,7 +380,7 @@ sync_repo() { | |
squash ${squash_commits} | |
# if there is no pending merge commit, update Godeps.json because this could be a target of tag | |
- if [ -z "${k_pending_merge_commit}" ]; then | |
+ if ! pick-incorrect-godep-changes ${k_mainline_commit} && [ -z "${k_pending_merge_commit}" ]; then |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash -ex | |
cd $GOPATH/src/k8s.io | |
rm -rf cache.new | |
if [ ! -d cache ]; then | |
mkdir cache.new | |
pushd cache.new | |
for repo in $(ls -1 ../kubernetes/staging/src/k8s.io); do | |
git clone https://github.com/kubernetes/${repo}.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash -ex | |
rm -rf cache.new | |
if [ ! -d cache ]; then | |
mkdir cache.new | |
pushd cache.new | |
for repo in $(ls -1 ../kubernetes/staging/src/k8s.io); do | |
git clone https://github.com/kubernetes/${repo}.git | |
done | |
popd |