From 5faf56e111914197b7d75520d60a8c29103d66be Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 27 Nov 2023 19:32:09 -0500 Subject: [PATCH 1/4] Update mirror_noir_subrepo.yml --- .github/workflows/mirror_noir_subrepo.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/mirror_noir_subrepo.yml b/.github/workflows/mirror_noir_subrepo.yml index 94499d1e205..497af2b0345 100644 --- a/.github/workflows/mirror_noir_subrepo.yml +++ b/.github/workflows/mirror_noir_subrepo.yml @@ -9,10 +9,7 @@ concurrency: on: push: branches: - - master - paths: - - 'noir/**' - - '!noir/.gitrepo' + - temp jobs: mirror_repo: From a1bfe2d4dd45a94ecc00da963887bf96f86bc34f Mon Sep 17 00:00:00 2001 From: AztecBot Date: Tue, 28 Nov 2023 00:36:35 +0000 Subject: [PATCH 2/4] git_subrepo.sh: Fix parent in .gitrepo file. [skip ci] --- noir/.gitrepo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noir/.gitrepo b/noir/.gitrepo index 6203c8d6afd..844683e8688 100644 --- a/noir/.gitrepo +++ b/noir/.gitrepo @@ -7,6 +7,6 @@ remote = https://github.com/noir-lang/noir branch = master commit = 90a63042d5b5eb2edf03378dff46ce75c9cb33ba - parent = bef260888e9f3799543d5a76f5ba40d9b9e4db89 + parent = 5b90a115508b6c4590660ac3e0efd73cf08d36b6 method = pull cmdver = 0.4.6 From 90f262a2d125f66ff367ac40edc4c76da29e3fa7 Mon Sep 17 00:00:00 2001 From: AztecBot Date: Tue, 28 Nov 2023 00:36:38 +0000 Subject: [PATCH 3/4] git subrepo push --branch=aztec noir subrepo: subdir: "noir" merged: "6743afcc7" upstream: origin: "https://github.com/noir-lang/noir" branch: "aztec" commit: "6743afcc7" git-subrepo: version: "0.4.6" origin: "???" commit: "???" [skip ci] --- noir/.gitrepo | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/noir/.gitrepo b/noir/.gitrepo index 844683e8688..c615890741b 100644 --- a/noir/.gitrepo +++ b/noir/.gitrepo @@ -5,8 +5,8 @@ ; [subrepo] remote = https://github.com/noir-lang/noir - branch = master - commit = 90a63042d5b5eb2edf03378dff46ce75c9cb33ba - parent = 5b90a115508b6c4590660ac3e0efd73cf08d36b6 - method = pull + branch = aztec + commit = 6743afcc77014fac575469395116b77dd205caf7 + parent = a1bfe2d4dd45a94ecc00da963887bf96f86bc34f + method = merge cmdver = 0.4.6 From fc0bb5045ba7662ed7c369e2a61f3188fe30e2f5 Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 27 Nov 2023 19:38:06 -0500 Subject: [PATCH 4/4] Update mirror_noir_subrepo.yml --- .github/workflows/mirror_noir_subrepo.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mirror_noir_subrepo.yml b/.github/workflows/mirror_noir_subrepo.yml index 497af2b0345..94499d1e205 100644 --- a/.github/workflows/mirror_noir_subrepo.yml +++ b/.github/workflows/mirror_noir_subrepo.yml @@ -9,7 +9,10 @@ concurrency: on: push: branches: - - temp + - master + paths: + - 'noir/**' + - '!noir/.gitrepo' jobs: mirror_repo: