[0.21] Additional backports #22578

pull fanquake wants to merge 3 commits into bitcoin:0.21 from fanquake:0_21_fix_macOS_ci changing 7 files +18 −6
  1. fanquake commented at 3:35 AM on July 29, 2021: member

    This backports a few changes to fix CI failures we are seeing with the 0.21 branch.

    Backports #21663, this might be the easiest way to fix the macOS CI failures we're seeing. i.e in #22569. The underlying issue is that the older CI images are using a version of brew that without running brew update first, is trying to download packages like Boost, from bintray (which no-longer works).

    This also includes #20182, as by fixing macOS failure, via running brew upgrade, we end up using a newer version of miniupnpc, which emits a GNU extension related warning, and causes the build to fail, because we use -Werror.

    Backporting #20535 should fix #22581.

  2. fanquake added the label Backport on Jul 29, 2021
  3. fanquake added this to the milestone 0.21.2 on Jul 29, 2021
  4. fanquake force-pushed on Jul 29, 2021
  5. fanquake commented at 8:35 AM on July 29, 2021: member

    Changed this to just backport #21663. While this change introduced a decent time hit to the CI (i.e #22068), it should be less of an issue in this branch, as the CI not only runs less frequently, but runs slower anyways due to Cirrus scheduling.

  6. ci: Fix macOS brew install command
    Details: https://github.com/Homebrew/discussions/discussions/691
    
    Github-Pull: #21663
    Rebased-From: b7381552cd4f965c45f1560d9cfc2fb09dbfcc1d
    89426c43fb
  7. fanquake force-pushed on Jul 29, 2021
  8. fanquake renamed this:
    [0.21] Backport #22122 to fix macOS CI issues
    [0.21] Backport #21663 to fix macOS CI issues
    on Jul 29, 2021
  9. ci: Build with --enable-werror by default, and document exceptions
    Github-Pull: #20182
    Rebased-From: 2f6fe4e4e9e9e35e713c0a20cf891b023592110a
    681f728a35
  10. test: Fix intermittent feature_taproot issue
    Github-Pull: #20535
    Rebased-From: fa275e1539941b49fe206ff0bf110e3362bec6bb
    55e941f5df
  11. fanquake renamed this:
    [0.21] Backport #21663 to fix macOS CI issues
    [0.21] Additional backports
    on Jul 29, 2021
  12. fanquake commented at 12:34 PM on July 29, 2021: member

    Annoyingly, "fixing" the macOS brew means using a newer version of miniupnpc, which emits a GNU extension related warning, and causes the build to fail, because we use -Werror. I think enabling --suppress-external-warnings is going to be the easiest fix, via backporting #20182.

    I've also added #20535 here to fix #22581.

  13. fanquake commented at 4:04 AM on July 30, 2021: member

    Looks like these fixes are working, and should be ok to merge. The failure on the sanitizer job is a timeout.

  14. hebasto approved
  15. hebasto commented at 7:05 AM on July 30, 2021: member

    ACK 55e941f5df18ce6d9b1ee8759f1419c5d1f03a8f, I verified changes by backporting locally.

  16. MarcoFalke merged this on Jul 30, 2021
  17. MarcoFalke closed this on Jul 30, 2021

  18. fanquake deleted the branch on Aug 1, 2021
  19. ComputerCraftr referenced this in commit d2b1f1b2f2 on Aug 18, 2021
  20. tcharding referenced this in commit 433ac6fcef on Jul 22, 2022
  21. tcharding referenced this in commit 60a2417a8f on Aug 3, 2022
  22. DrahtBot locked this on Aug 18, 2022

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-17 09:14 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me