Skip to content
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions noir/scripts/sync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,15 @@ function latest_nightly {

# Create an empty marker commit to show that patches have been applied or put in a patch file.
function commit_patch_marker {
git -C noir-repo commit -m "$PATCH_COMMIT_MSG" --allow-empty
git -C noir-repo commit -m "$PATCH_COMMIT_MSG" --allow-empty --no-gpg-sign
}

# Apply the fixup script and any local patch file.
function patch_repo {
log Applying fixup on noir-repo
# Redirect the `bb` reference to the local one.
scripts/sync-in-fixup.sh
git -C noir-repo add . && git -C noir-repo commit -m "$FIXUP_COMMIT_MSG" --allow-empty
git -C noir-repo add . && git -C noir-repo commit -m "$FIXUP_COMMIT_MSG" --allow-empty --no-gpg-sign
# Apply any patch file.
if [ -f $NOIR_REPO_PATCH ]; then
log Applying patches from $NOIR_REPO_PATCH
Expand Down