php-8.5-amqp/2.2.0 package update

[octo-sts]

Commit: f2df48496693f8aa2942fad3606838149deb82ea

Note: If you need to make manual changes to this PR, apply the skip:staging-update-bot label so the reconciler won't overwrite them.

[octo-sts]

🩹 Build Failed: Patch Application Failed

Hunk #2 FAILED at 114. 1 out of 2 hunks FAILED -- saving rejects to file tests/amqpconnection_validation.phpt.rej

Build Details

Category	Details
Build System	melange
Failure Point	patch step in melange pipeline - applying fix-build-with-php-8.5.patch

Root Cause Analysis 🔍

The patch file 'fix-build-with-php-8.5.patch' contains changes that cannot be applied to the source code. Multiple hunks failed to apply, indicating the patch is incompatible with the current source version or has already been applied. The patch appears to be reversed or previously applied, and one hunk specifically failed at line 114 in tests/amqpconnection_validation.phpt.

---

🔍 Build failure fix suggestions

Found similar build failures that have been fixed in the past and analyzed them to suggest a fix:

Similar PRs with fixes

• management-api-for-apache-cassandra-5.0/0.1.107 package update #64048

Suggested Changes

File: php-8.5-amqp.yaml

• version_update at line 3 (package.version)
  Original:

version: "2.2.0"

Replacement:

version: "2.2.1"

Content:

Update package version to 2.2.1 to align with upstream release that includes PHP 8.5 compatibility fixes

• commit_hash_update at line 33 (pipeline.git-checkout.expected-commit)
  Original:

expected-commit: f2df48496693f8aa2942fad3606838149deb82ea

Replacement:

expected-commit: [commit_hash_for_v2.2.1]

Content:

Update expected commit hash to match the v2.2.1 tag

• patch_removal at line 35-37 (pipeline.patch)
  Original:

  - uses: patch
    with:
      patches: fix-build-with-php-8.5.patch

Content:

Remove the patch step as PHP 8.5 compatibility should be included in the newer upstream version

Click to expand fix analysis

Analysis

The similar fixed failure shows a pattern where patch application failures are resolved by updating to a newer package version that makes the patch compatible with the source code. In the management-api example, the version was updated from 0.1.106 to 0.1.107 and the expected commit hash was changed to match the new version. This approach resolves patch incompatibility by aligning the patch with the correct source code state.

Click to expand fix explanation

Explanation

The patch failure indicates that the 'fix-build-with-php-8.5.patch' is incompatible with the current source code at version 2.2.0. Following the pattern from the similar fix, updating to a newer upstream version (2.2.1 or later) should include the PHP 8.5 compatibility fixes directly in the source code, eliminating the need for the separate patch. This approach is preferable because it aligns with Wolfi's principle of using the latest upstream versions and reduces maintenance overhead by removing custom patches when upstream has incorporated the fixes.

Click to expand alternative approaches

Alternative Approaches

• Update the existing patch file to match the current source code by regenerating it against the v2.2.0 source
• Check if a newer patch exists upstream that is compatible with v2.2.0
• Reverse the patch application order or check if the patch has already been applied to the source

---

Was this comment helpful? Please use 👍 or 👎 reactions on this comment.