Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: sync with main noir repo at 3416229b70 #3948

Closed
wants to merge 2 commits into from
Closed

feat: sync with main noir repo at 3416229b70 #3948

wants to merge 2 commits into from

Conversation

spalladino
Copy link
Collaborator

@spalladino spalladino commented Jan 11, 2024 •
edited
Loading 

subrepo:
  subdir:   "noir"
  merged:   "3416229b70"
upstream:
  origin:   "https://github.com/noir-lang/noir"
  branch:   "aztec-packages"
  commit:   "3416229b70"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

@spalladino
git subrepo commit (merge) noir
eb108f5 
subrepo:
  subdir:   "noir"
  merged:   "62987342e7"
upstream:
  origin:   "https://github.com/noir-lang/noir"
  branch:   "aztec-packages"
  commit:   "75c83348e6"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"
TomAFrench
TomAFrench approved these changes Jan 11, 2024
View reviewed changes
Copy link
Member

@TomAFrench TomAFrench left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff looks as expected. Happy to merge assuming no sudden CI snafus

@socket-security Socket Security
Copy link

New dependencies detected. Learn more about Socket for GitHub ↗︎

Packages Version New capabilities Transitives Size Publisher
browserify-fs 1.0.0 filesystem +37 1.19 MB mafintosh
@types/mocha-each 2.0.4 None +0 5.56 kB types
@types/adm-zip 0.5.5 None +0 24.7 kB types
@types/path-browserify 1.0.2 None +0 4.26 kB types
@wasm-tool/wasm-pack-plugin 1.7.0 environment +0 13.7 kB xtuc
@ltd/j-toml 1.38.0 None +0 812 kB ltd
@types/sinon 17.0.2 None +1 93.8 kB types
path-browserify 1.0.1 None +0 54.3 kB goto-bus-stop
mocha-each 2.0.1 None +1 53.8 kB ryym
assert 2.1.0 None +1 92.9 kB ljharb
webpack-cli 4.10.0 None +5 164 kB evilebottnawi
url 0.11.3 None +0 78.3 kB ljharb
sinon 17.0.1 environment +8 7.5 MB fatso83

@spalladino spalladino enabled auto-merge (squash) January 11, 2024 14:53
@TomAFrench
Copy link
Member

jinxed it!

@TomAFrench
Copy link
Member

noir-lang/noir#4014

@spalladino
git subrepo pull (merge) --force noir
d9bf7ac 
subrepo:
  subdir:   "noir"
  merged:   "3416229b70"
upstream:
  origin:   "https://github.com/noir-lang/noir"
  branch:   "aztec-packages"
  commit:   "3416229b70"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"
@spalladino spalladino changed the title feat: sync with main noir repo at 75c83348e6 feat: sync with main noir repo at 3416229b70 Jan 11, 2024
@spalladino spalladino requested a review from TomAFrench January 11, 2024 18:40
@spalladino
Copy link
Collaborator Author

Updated to the latest aztec-packages branch in Noir to include your fix @TomAFrench

@spalladino spalladino disabled auto-merge January 11, 2024 18:41
@ludamad ludamad mentioned this pull request Jan 11, 2024
Merged
@spalladino spalladino closed this Jan 11, 2024
@spalladino spalladino deleted the palla/sync-noir branch January 11, 2024 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sirasistant sirasistant Awaiting requested review from sirasistant

@TomAFrench TomAFrench Awaiting requested review from TomAFrench

Assignees
No one assigned
Labels
None yet
Projects
A3
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@spalladino @TomAFrench