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

fix: barretenberg subrepo #1206

Merged
merged 2 commits into from
Jul 26, 2023
Merged

fix: barretenberg subrepo #1206

merged 2 commits into from
Jul 26, 2023

Conversation

ludamad
Copy link
Collaborator

@ludamad ludamad commented Jul 26, 2023 •
edited
Loading

Description

Cleaning up after accidentally setting up mirroring to main, a bit of pain. Some manual history replay (kev's commit here). Needs to go in as a rebase.

Checklist:

  • I have reviewed my diff in github, line by line.
  • Every change is related to the PR description.
  • I have linked this pull request to the issue(s) that it resolves.
  • There are no unexpected formatting changes, superfluous debug logs, or commented-out code.
  • The branch has been merged or rebased against the head of its merge target.
  • I'm happy for the PR to be merged at the reviewer's next convenience.

@netlify
Copy link

netlify bot commented Jul 26, 2023 •
edited
Loading

✅ Deploy Preview for preeminent-bienenstitch-606ad0 canceled.

Name Link
🔨 Latest commit 1770129
🔍 Latest deploy log https://app.netlify.com/sites/preeminent-bienenstitch-606ad0/deploys/64c13a72b23b5600077d131e

@ludamad
git subrepo pull --branch=ci-test-master-copy --force circuits/cpp/ba…
1770129 
…rretenberg

subrepo:
  subdir:   "circuits/cpp/barretenberg"
  merged:   "d840024cf"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "ci-test-master-copy"
  commit:   "d840024cf"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@ludamad ludamad force-pushed the ad/fix-barretenbergsubrepo branch from b089304 to 1770129 Compare July 26, 2023 15:23
Maddiaa0
Maddiaa0 reviewed Jul 26, 2023
View reviewed changes
Copy link
Member

@Maddiaa0 Maddiaa0 left a comment

Choose a reason for hiding this comment

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

submoduling looks good to me, i cant speak for the bb changes

Maddiaa0
Maddiaa0 approved these changes Jul 26, 2023
View reviewed changes
Copy link
Member

@Maddiaa0 Maddiaa0 left a comment

Choose a reason for hiding this comment

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

approving as bb changes are from upstream

@ludamad ludamad enabled auto-merge (rebase) July 26, 2023 15:28
@ludamad ludamad merged commit 5951eac into master Jul 26, 2023
@ludamad ludamad deleted the ad/fix-barretenbergsubrepo branch July 26, 2023 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Maddiaa0 Maddiaa0 Maddiaa0 approved these changes

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
@ludamad @Maddiaa0