Skip to content

Commit 5c2dd1d

Browse files
committed
Subtree update automation: remove extraneous library folder
This restores a fix from model-checking#250 that was deemed no longer necessary with the move to subtree split (in model-checking#270), but this proved to be wrong. (See model-checking@ab648fe for such an example of an unintended change.)
1 parent 9b27cfb commit 5c2dd1d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.github/workflows/update-subtree.yml

+4
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ jobs:
117117
git remote add rust-filtered ../rust-tmp/
118118
git fetch rust-filtered
119119
git checkout -b subtree/library rust-filtered/subtree/library
120+
# The checkout still leaves behind the library folder with submodules.
121+
# We need to remove this as we'd otherwise have the create-pull-request
122+
# action create an extra commit.
123+
rm -rf library
120124
SUBTREE_HEAD_MSG=$(git log --format=%s -n 1 origin/subtree/library)
121125
UPSTREAM_FROM=$(git log --grep="${SUBTREE_HEAD_MSG}" -n 1 --format=%H rust-filtered/subtree/library)
122126
UPSTREAM_HEAD=$(git log --format=%H -n 1 rust-filtered/subtree/library)

0 commit comments

Comments
 (0)