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.

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

Merge main into V2 to fix CI #1839

Merged
merged 19 commits into from
Sep 26, 2024
Merged

Merge main into V2 to fix CI #1839

merged 19 commits into from
Sep 26, 2024

Conversation

Trivo25
Copy link
Member

@Trivo25 Trivo25 commented Sep 26, 2024

mostly to make sure the CI fixes also land in V2

@@ -35,7 +35,9 @@ it('pickles rule creation', async () => {
// a rule that verifies a proof conditionally, and returns the proof's input as output
function main(proof: EmptyProof, shouldVerify: Bool) {
proof.verifyIf(shouldVerify);
return proof.publicInput;
return {
Copy link
Member Author

Choose a reason for hiding this comment

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

left over fix from the auxiliary output PR which wasn't caught in CI

@Trivo25 Trivo25 merged commit eb56a56 into v2 Sep 26, 2024
25 checks passed
@Trivo25 Trivo25 deleted the merge-main-v2 branch September 26, 2024 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants