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: edge-case where repo mirror action fails to commit #1382

Closed
ludamad opened this issue Aug 2, 2023 · 1 comment
Closed

fix: edge-case where repo mirror action fails to commit #1382

ludamad opened this issue Aug 2, 2023 · 1 comment
Labels
A-devops Area: Devops. E.g. CI / build systems

Comments

@ludamad
Copy link
Collaborator

ludamad commented Aug 2, 2023 •
edited
Loading

Since a commit might happen before the mirror action gets a chance to run, it's best to error handle this and push to the new master. This should be rare. This should probably be taken up if it happens again say 1 to 3 times.
@github-project-automation github-project-automation bot moved this to Todo in A3 Aug 2, 2023
@ludamad ludamad mentioned this issue Aug 2, 2023
Merged
ludamad added a commit that referenced this issue Aug 2, 2023
@ludamad
git subrepo pull (merge) circuits/cpp/barretenberg (#1380)
bd9b36f 
Fix the barretenberg mirror action. Looks like commits went in too close
together, see #1382

` ./scripts/git_subrepo.sh pull circuits/cpp/barretenberg`
`git checkout origin/master -- .gitmodules`
`git commit`
This should always work if anyone needs to do this again. In more
complicated cases you may be instructed to do a merge. In this case the
commit just became overwritten.

```
subrepo:
  subdir:   "circuits/cpp/barretenberg"
  merged:   "96fb60558"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "master"
  commit:   "d4ade2a5f"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
```
@iAmMichaelConnor iAmMichaelConnor added the A-devops Area: Devops. E.g. CI / build systems label Aug 25, 2023
@ludamad
Copy link
Collaborator Author

ludamad commented Sep 26, 2023

Closing as fixed

@ludamad ludamad closed this as completed Sep 26, 2023
@github-project-automation github-project-automation bot moved this from Todo to Done in A3 Sep 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
A-devops Area: Devops. E.g. CI / build systems
Projects
A3
Archived in project
Milestone
No milestone
Development

No branches or pull requests
2 participants
@ludamad @iAmMichaelConnor