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

Bump com.github.spullara.mustache.java:compiler from 0.9.10 to 0.9.11 #13329

Merged
merged 5 commits into from
Apr 23, 2024

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Apr 22, 2024

Description

Manually creating a version bump of com.github.spullara.mustache.java:compiler from 0.9.10 to 0.9.11 because the dependabot PR has been having issues with the gradle check.

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Craig Perkins <[email protected]>
Copy link
Contributor

❌ Gradle check result for 222c967: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

❌ Gradle check result for 7ba1eb1: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Signed-off-by: Craig Perkins <[email protected]>
Copy link
Contributor

❌ Gradle check result for fcf4be0: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

✅ Gradle check result for fcf4be0: SUCCESS

Copy link
Contributor

❕ Gradle check result for b838c5f: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.cluster.MinimumClusterManagerNodesIT.testThreeNodesNoClusterManagerBlock

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Apr 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.48%. Comparing base (b15cb0c) to head (68ab7bc).
Report is 210 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #13329      +/-   ##
============================================
+ Coverage     71.42%   71.48%   +0.06%     
- Complexity    59978    60636     +658     
============================================
  Files          4985     5039      +54     
  Lines        282275   285428    +3153     
  Branches      40946    41336     +390     
============================================
+ Hits         201603   204035    +2432     
- Misses        63999    64508     +509     
- Partials      16673    16885     +212     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

❕ Gradle check result for 68ab7bc: UNSTABLE

  • TEST FAILURES:
      2 org.opensearch.cluster.MinimumClusterManagerNodesIT.testThreeNodesNoClusterManagerBlock
      1 org.opensearch.repositories.azure.AzureBlobContainerRetriesTests.testWriteBlobWithRetries

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

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

Looks like changes in modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/20_render_search_template.yml came for the ride.

@cwperks
Copy link
Member Author

cwperks commented Apr 23, 2024

@dblock The dependabot PR is failing on that test.

ref: https://build.ci.opensearch.org/job/gradle-check/30414/console

I had to update the test for this dependency update.

@dblock
Copy link
Member

dblock commented Apr 23, 2024

@cwperks I assume that addition that now includes the field in the catch is expected?

@dblock dblock added backport 2.x Backport to 2.x branch skip-changelog labels Apr 23, 2024
@dblock dblock merged commit 97e3191 into opensearch-project:main Apr 23, 2024
33 of 35 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-13329-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 97e319109b2159e349269e9188aeb94c72165685
# Push it to GitHub
git push --set-upstream origin backport/backport-13329-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-13329-to-2.x.

@dblock
Copy link
Member

dblock commented Apr 23, 2024

Another backport bites the dust @cwperks please.

cwperks added a commit to cwperks/OpenSearch that referenced this pull request Apr 23, 2024
…opensearch-project#13329)

* Bump com.github.spullara.mustache.java:compiler from 0.9.10 to 0.9.11

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Fix error in yamlRestTest

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit 97e3191)
@cwperks
Copy link
Member Author

cwperks commented Apr 23, 2024

@dblock Here's the backport: #13353

Yes there was a change in the error message in the library and the test expected the message in a certain format. See the change here

owaiskazi19 pushed a commit that referenced this pull request Apr 23, 2024
…#13329) (#13353)

* Bump com.github.spullara.mustache.java:compiler from 0.9.10 to 0.9.11

Signed-off-by: Craig Perkins <[email protected]>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <[email protected]>

* Fix error in yamlRestTest

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit 97e3191)
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.

2 participants