Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Resolve merge conflict in building 1.7.13 #2370

Merged
merged 2 commits into from
Mar 2, 2018
Merged

Resolve merge conflict in building 1.7.13 #2370

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
779662c
Resolve merge conflict in building 1.7.13
JiangtianLi Mar 1, 2018
4faf368
Add comment
JiangtianLi Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 33 additions & 19 deletions scripts/build-windows-k8s.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,25 +72,39 @@ k8s_16_cherry_pick() {
}

k8s_17_cherry_pick() {
# In 1.7.12, the following commits are cherry-picked in upstream and has conflict
# with 137f4cb16e. So removing them.
git revert --no-edit 593653c384 || true
git revert --no-edit 7305738dd1 || true
git revert --no-edit e01bafcf80 || true
git revert --no-edit afd79db7a6 || true
git revert --no-edit 3a4abca2f7 || true
git revert --no-edit 6a2e2f47d3 || true

# In 1.7.10, the following commit is not needed and has conflict with 137f4cb16e
# due to the out-of-order back porting into Azure 1.7. So removing it.
# cee32e92f7 fix#50150: azure disk mount failure on coreos
git revert --no-edit cee32e92f7 || true

# cce920d45e merge#54334: fix azure disk mount failure on coreos and some other distros
# ...
# b8fe713754 Use adapter vEthernet (HNSTransparent) on Windows host network to find node IP

git cherry-pick --allow-empty --keep-redundant-commits b8fe713754^..cce920d45e
if [ "${version}" \>= "1.7.10" ]; then
# In 1.7.10, the following commit is not needed and has conflict with 137f4cb16e
# due to the out-of-order back porting into Azure 1.7. So removing it.
# cee32e92f7 fix#50150: azure disk mount failure on coreos
git revert --no-edit cee32e92f7 || true

if [ "${version}" \>= "1.7.12" ]; then
# In 1.7.12, the following commits are cherry-picked in upstream and has conflict
# with 137f4cb16e. So removing them.
git revert --no-edit 593653c384 || true #only for linux
git revert --no-edit 7305738dd1 || true #add tests only
git revert --no-edit e01bafcf80 || true #only for linux
git revert --no-edit afd79db7a6 || true #only for linux
git revert --no-edit 3a4abca2f7 || true #covered by commit 3aa179744f
git revert --no-edit 6a2e2f47d3 || true #covered by commit 3aa179744f

if [ "${version}" \>= "1.7.13" ]; then
# In 1.7.13, the following commit is cherry-picked in upstream and has conflict
# with 137f4cb16e. So removing it.
git revert --no-edit 3aa179744f || true #only for linux
fi
fi
fi

# cce920d45e merge#54334: fix azure disk mount failure on coreos and some other distros
# ...
# b8fe713754 Use adapter vEthernet (HNSTransparent) on Windows host network to find node IP
# 1.7.13 does not need acbdec96da since 060111c603 supercedes it
git cherry-pick --allow-empty --keep-redundant-commits b8fe713754^..e912889a7f
if [ "${version}" \< "1.7.13" ]; then
git cherry-pick --allow-empty --keep-redundant-commits acbdec96da
fi
git cherry-pick --allow-empty --keep-redundant-commits 76d7c23f62^..cce920d45e
}

k8s_18_cherry_pick() {
Expand Down