-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge Use config files from develop in CI
This merge changes our formatting CI to use the config files from develop. We already use the dev_tool scripts from develop, so this makes it more consistent. Related PR: #1470
- Loading branch information
Showing
2 changed files
with
5 additions
and
1 deletion.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,7 @@ git config user.email "[email protected]" | |
git config user.name "ginkgo-bot" | ||
|
||
# save scripts from develop | ||
cp .clang-format .pre-commit-config.yaml /tmp | ||
pushd dev_tools/scripts || exit 1 | ||
cp add_license.sh format_header.sh update_ginkgo_header.sh /tmp | ||
popd || exit 1 | ||
|
@@ -22,6 +23,8 @@ LOCAL_BRANCH=format-tmp-$HEAD_BRANCH | |
git checkout -b $LOCAL_BRANCH fork/$HEAD_BRANCH | ||
|
||
# restore files from develop | ||
cp /tmp/.clang-format . | ||
cp /tmp/.pre-commit-config . | ||
cp /tmp/add_license.sh dev_tools/scripts/ | ||
cp /tmp/format_header.sh dev_tools/scripts/ | ||
cp /tmp/update_ginkgo_header.sh dev_tools/scripts/ |
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