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

[ PATCH ] 0.12.x with PR 3081 terse webhooks #3141

Merged
merged 2 commits into from
Aug 1, 2024

Conversation

jamshale
Copy link
Contributor

@jamshale jamshale commented Jul 31, 2024

Cherry picks #3081 commits for the 0.12.x patch release.

Need to run integration tests locally. There was no merge conflicts.

Signed-off-by: Ian Costanzo <ian@anon-solutions.ca>
Signed-off-by: Ian Costanzo <ian@anon-solutions.ca>
@jamshale jamshale changed the title [ PATCH ] 0.12.x with #3081 [ PATCH ] 0.12.x with https://github.com/hyperledger/aries-cloudagent-python/pull/3081 Jul 31, 2024
@jamshale jamshale marked this pull request as ready for review July 31, 2024 20:45
@jamshale jamshale changed the title [ PATCH ] 0.12.x with https://github.com/hyperledger/aries-cloudagent-python/pull/3081 [ PATCH ] 0.12.x with PR 3081 terse webhooks Jul 31, 2024
@swcurran swcurran requested a review from esune July 31, 2024 21:01
@jamshale
Copy link
Contributor Author

jamshale commented Jul 31, 2024

I don't understand why snyk is complaining about some sort of merge conflict? I think it's comparing against main or something. I'm sure there's no actual merge conflicts.

@jamshale
Copy link
Contributor Author

Passed all the GHA integration tests locally.

@swcurran
Copy link
Member

Any ideas on the the Snyk failure?

Do we need an 0.12.2rc2 or just include this and declare it final?

Copy link
Contributor

@esune esune left a comment

Choose a reason for hiding this comment

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

Changes look good to me. I can't (yet) access the Snyk report so I am unable to help with that.

@jamshale
Copy link
Contributor Author

jamshale commented Aug 1, 2024

I think the snyk scan just has issues with dockerfiles scanned for main and then re-scanned on a lts branch and says there's a merge conflict because the bas image is different. I marked it as passed.

@jamshale jamshale merged commit 3619c68 into hyperledger:0.12.x Aug 1, 2024
5 checks passed
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