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

thingsboard/3.9 package update #38547

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

octo-sts[bot]
Copy link
Contributor

@octo-sts octo-sts bot commented Dec 31, 2024

Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
@octo-sts octo-sts bot added request-version-update request for a newer version of a package automated pr labels Dec 31, 2024
Copy link
Contributor Author

octo-sts bot commented Dec 31, 2024

Gen AI suggestions to solve the build error:

• Detected Error: "[git checkout] failed to cherry-pick b0809bef1c006a8795afbba514b6b84157ead304 from branch master"

• Error Category: Version/Configuration

• Failure Point: Cherry-pick operation in git-checkout pipeline step

• Root Cause Analysis: The cherry-pick operation failed because the changes from commit b0809bef1c (Spring version bumps) are likely already present in the target version (v3.9), resulting in an empty cherry-pick.

• Suggested Fix:

  1. Remove or modify the cherry-picks section in the YAML:
  - uses: git-checkout
    with:
      expected-commit: 5a16da51b5d755e18c5d8088e88336f07e4766ea
      repository: https://github.com/thingsboard/thingsboard.git
      tag: v${{package.version}}
      # Either remove cherry-picks entirely or update with:
      cherry-picks: |
        master/b0809bef1c006a8795afbba514b6b84157ead304: Fixes GHSA-2x2g-32r7-p4x8: Spring version bumps || true

• Explanation:
The empty cherry-pick indicates that the changes are already present in the target version. Adding || true will allow the build to continue even if the cherry-pick is empty, or removing it entirely if the security fixes are already included in v3.9.

• Additional Notes:

  • The Spring version security fixes might already be incorporated in v3.9
  • Cherry-pick failures are common when backporting fixes that are already present
  • Consider verifying if the Spring security fixes are already present in v3.9 before applying the cherry-pick

• References:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automated pr request-version-update request for a newer version of a package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant