Better message

AztecProtocol · Feb 5, 2024 · b36973f · b36973f
1 parent 51ae883
commit b36973f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/test_action.yml b/.github/workflows/test_action.yml
@@ -55,7 +55,10 @@ jobs:
           cd ..
           # Now push to it with subrepo with all non-noise commit messages
           MESSAGE=$(git log --pretty=format:"%s" $BASE_AZTEC_COMMIT..HEAD -- noir/  ':!noir/.gitrepo' | grep -v 'git subrepo || true')
-          if ./scripts/git_subrepo.sh push $SUBREPO_PATH --squash -m"$MESSAGE" --branch=$BRANCH; then
+          git commit --allow-empty -m "Sync to noir repo" -m "BEGIN_COMMIT_OVERRIDE\n$MESSAGE\nEND_COMMIT_OVERRIDE"
+          COMMIT=$(git rev-parse HEAD)
+          if ./scripts/git_subrepo.sh push $SUBREPO_PATH --squash --branch=$BRANCH; then
+            git reset $COMMIT
             git commit --amend -m "$(git log -1 --pretty=%B) [skip ci]"
             git push
           else

diff --git a/noir/.gitrepo b/noir/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/noir-lang/noir
 	branch = aztec-packages
-	commit = 0205d3b4ad0cf5ffd775a43eb5af273a772cf138
+	commit = 9a70040211d205f472aa31924649c2fef999eb49
 	parent = 9c965a7c9e652dfeaba2f09152e5db287407473d
 	method = merge
 	cmdver = 0.4.6