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

Update to EISOP 3.34-eisop1 from 3.32-eisop1 #254

Merged
merged 57 commits into from
Mar 28, 2024

Conversation

Ao-senXiong
Copy link

@Ao-senXiong Ao-senXiong commented Feb 7, 2024

Relevant PRs are:

For CFI: opprop/checker-framework-inference#437
For Annotation-tools: opprop/annotation-tools#130
For JDK: opprop/jdk#5
For Stubparser: opprop/stubparser#56

smillst and others added 30 commits March 9, 2023 12:59
Co-authored-by: Suzanne Millstein <[email protected]>
Co-authored-by: Michael Ernst <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Martin Kellogg <[email protected]>
Co-authored-by: Haifeng Shi <[email protected]>
@wmdietl
Copy link
Member

wmdietl commented Mar 22, 2024

@Ao-senXiong Something must have gone wrong when you pulled the EISOP changes. There are no individual commits with the changes, only a merge commit.
Do not cherry-pick or merge the changes for EISOP. All commits from EISOP/cf should also be in OPPROP/cf.

@Ao-senXiong Ao-senXiong force-pushed the checker-framework-3.34.0-eisop1 branch 2 times, most recently from deb8158 to 1cc47bf Compare March 22, 2024 18:22
@Ao-senXiong
Copy link
Author

Ao-senXiong commented Mar 27, 2024

@Ao-senXiong Something must have gone wrong when you pulled the EISOP changes. There are no individual commits with the changes, only a merge commit. Do not cherry-pick or merge the changes for EISOP. All commits from EISOP/cf should also be in OPPROP/cf.

Hi @wmdietl, I have redo the change and this PR is ready for review.

@wmdietl wmdietl merged commit 32f25d1 into opprop:master Mar 28, 2024
36 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.

8 participants