Skip to content

Backport of KEY-2.12.1 into main#3296

Merged
wadoon merged 17 commits into
mainfrom
weigl/backport2121
Oct 13, 2023
Merged

Backport of KEY-2.12.1 into main#3296
wadoon merged 17 commits into
mainfrom
weigl/backport2121

Conversation

@wadoon
Copy link
Copy Markdown
Member

@wadoon wadoon commented Oct 13, 2023

Backporting the bug fixes in KEY-2.12.1 to main. This PR supersedes #3251 to avoid merge conflicts due to file header changes. Necessary changes were cherry-picked.

@wadoon wadoon force-pushed the weigl/backport2121 branch from 05635af to cfbb1e1 Compare October 13, 2023 10:48
@wadoon wadoon requested a review from WolframPfeifer October 13, 2023 10:50
@wadoon wadoon self-assigned this Oct 13, 2023
@wadoon wadoon marked this pull request as ready for review October 13, 2023 10:51
@codecov
Copy link
Copy Markdown

codecov Bot commented Oct 13, 2023

Codecov Report

Merging #3296 (a302071) into main (bf8cca5) will increase coverage by 0.02%.
Report is 4 commits behind head on main.
The diff coverage is 80.95%.

@@             Coverage Diff              @@
##               main    #3296      +/-   ##
============================================
+ Coverage     37.78%   37.81%   +0.02%     
  Complexity    16851    16851              
============================================
  Files          2052     2052              
  Lines        125409   125485      +76     
  Branches      21220    21228       +8     
============================================
+ Hits          47386    47448      +62     
- Misses        72187    72196       +9     
- Partials       5836     5841       +5     
Files Coverage Δ
...n/java/de/uka/ilkd/key/control/KeYEnvironment.java 85.71% <ø> (ø)
.../java/de/uka/ilkd/key/speclang/njml/JmlChecks.java 100.00% <ø> (ø)
.../src/main/java/de/uka/ilkd/key/util/MiscTools.java 47.20% <100.00%> (+1.04%) ⬆️
...ava/de/uka/ilkd/key/macros/StrategyProofMacro.java 65.21% <66.66%> (+2.71%) ⬆️
...ka/ilkd/key/proof/reference/ReferenceSearcher.java 83.56% <0.00%> (ø)
...key/smt/communication/ExternalProcessLauncher.java 0.00% <0.00%> (ø)
...de/uka/ilkd/key/macros/ProofMacroFinishedInfo.java 15.09% <33.33%> (-0.91%) ⬇️
...rc/main/java/de/uka/ilkd/key/proof/Statistics.java 72.19% <96.72%> (+8.31%) ⬆️
...y_project/slicing/analysis/DependencyAnalyzer.java 85.19% <60.00%> (-0.44%) ⬇️
...e/src/main/java/de/uka/ilkd/key/java/Services.java 71.42% <0.00%> (-1.49%) ⬇️
... and 1 more

... and 3 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Oct 13, 2023

Thank you for your contribution.

The test artifacts are available on Artiweb.
The newest artifact is here.

@FliegendeWurst FliegendeWurst added this to the v2.14.0 milestone Oct 13, 2023
@wadoon wadoon enabled auto-merge October 13, 2023 13:52
Copy link
Copy Markdown
Member

@WolframPfeifer WolframPfeifer left a comment

Choose a reason for hiding this comment

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

Maybe we should revert the version number change (see my suggestion), or would it be better to have a separate commit/PR on main?

Comment thread build.gradle Outdated
Co-authored-by: Wolfram Pfeifer <94171076+WolframPfeifer@users.noreply.github.com>
@wadoon wadoon added this pull request to the merge queue Oct 13, 2023
Merged via the queue into main with commit 71edf0e Oct 13, 2023
@wadoon wadoon deleted the weigl/backport2121 branch October 13, 2023 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants