Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#96 from cjwagner/sync-clobber
Browse files Browse the repository at this point in the history
Prevent sync-prow.sh from clobbering itself.
  • Loading branch information
cjwagner committed Mar 26, 2024
2 parents 1a1a231 + 6c48425 commit 3a2d35b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions hack/scripts/sync-prow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ git fetch old_prow
git merge old_prow/master --no-edit --allow-unrelated-histories --strategy-option theirs

# Rename go module paths
find . -type f -exec sed -i 's,sigs.k8s.io/prow,sigs.k8s.io/prow,g' {} \;
git commit -a -m "Rename sigs.k8s.io/prow module to sigs.k8s.io/prow."
find . -type f -path ./hack/scripts/sync-prow.sh -prune -o -exec sed -i 's,k8s.io/test-infra,sigs.k8s.io/prow,g' {} \;
git commit -a -m "Rename k8s.io/test-infra module to sigs.k8s.io/prow."

echo "Sync completed successfully! 'cd ${new_prow} && git push origin' when you're ready."

0 comments on commit 3a2d35b

Please sign in to comment.