Skip to content

[23.x] ci: replace Intel macOS CI job#26879

Merged
maflcko merged 4 commits intobitcoin:23.xfrom
fanquake:23_remove_intel_macos_ci
Jan 16, 2023
Merged

[23.x] ci: replace Intel macOS CI job#26879
maflcko merged 4 commits intobitcoin:23.xfrom
fanquake:23_remove_intel_macos_ci

Conversation

@fanquake
Copy link
Copy Markdown
Member

@fanquake fanquake commented Jan 12, 2023

Intel macOS jobs are no-longer available on Cirrus.

@DrahtBot
Copy link
Copy Markdown
Contributor

DrahtBot commented Jan 12, 2023 •
edited
Loading

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type Reviewers
Stale ACK hebasto

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@fanquake fanquake changed the title [23.x] ci: reaplce intel macos ci job [23.x] ci: replace Intel macOS CI job Jan 12, 2023
@fanquake
Copy link
Copy Markdown
Member Author

fanquake commented Jan 12, 2023

https://github.com/bitcoin/bitcoin/pull/26879/checks?check_run_id=10602206141

Setting up g++-multilib (4:9.3.0-1ubuntu2) ...
Processing triggers for libc-bin (2.31-0ubuntu9.9) ...
bash: pip3: command not found

Exit status: 127

@maflcko
Copy link
Copy Markdown
Member

maflcko commented Jan 12, 2023

ci: Remove unused package doesn't make sense on 23.x (it is wrong)

@fanquake fanquake force-pushed the 23_remove_intel_macos_ci branch from 360ff52 to fd70fec Compare January 12, 2023 12:14
@maflcko
Copy link
Copy Markdown
Member

maflcko commented Jan 12, 2023

Maybe the other #26234 commit needs to be dropped as well? (It shouldn't affect macos)

@fanquake fanquake force-pushed the 23_remove_intel_macos_ci branch from fd70fec to 46d99d5 Compare January 12, 2023 13:20
@maflcko
Copy link
Copy Markdown
Member

maflcko commented Jan 12, 2023

Alternatively the task can be removed or ignored. (We only backport changes that pass on the master CI, so something that breaks here but not on master for one task seems unlikely)

@hebasto
Copy link
Copy Markdown
Member

hebasto commented Jan 12, 2023

Backporting of 8e017f3 should fix the native macOS task.

@fanquake fanquake force-pushed the 23_remove_intel_macos_ci branch from 46d99d5 to c2ee70a Compare January 13, 2023 09:59
@fanquake
Copy link
Copy Markdown
Member Author

fanquake commented Jan 13, 2023

Backporting of 8e017f3

Added.

Alternatively the task can be removed or ignored.

Yea. If this change doesn't work, happy to just remove it. The chance of some macOS only regression in this branch is basically nil, and I'd rather remove a consistently failing just than just leave it hanging around.

hebasto
hebasto approved these changes Jan 13, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@hebasto hebasto left a comment •
edited
Loading

Choose a reason for hiding this comment

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

ACK c2ee70a89b332f217bfe330dd6bead916afe0814

maflcko
maflcko reviewed Jan 13, 2023
View reviewed changes
Comment thread src/secp256k1/build-aux/ar-lib Outdated
@hebasto @fanquake
ci, refactor: Add MACOS_NATIVE_TASK_TEMPLATE
192759e 
A native macOS task does not aware of Linux container settings, and it
does not use the `depends_built_cache`.

Github-Pull: bitcoin#25444
Rebased-From: 8e017f3
@fanquake fanquake force-pushed the 23_remove_intel_macos_ci branch from c2ee70a to 821b454 Compare January 13, 2023 11:12
hebasto
hebasto approved these changes Jan 13, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK 821b454abb97d74a085af70f56c39da49ed06a5f

@fanquake fanquake requested a review from maflcko January 16, 2023 10:32
@maflcko
Copy link
Copy Markdown
Member

maflcko commented Jan 16, 2023

The metadata is wrong in the last commit. Also, could backport 0bb7a1f for easier cherrry-picking.

@fanquake fanquake force-pushed the 23_remove_intel_macos_ci branch from 821b454 to a3db8bd Compare January 16, 2023 11:06
@maflcko maflcko merged commit dd04f2d into bitcoin:23.x Jan 16, 2023
@fanquake fanquake deleted the 23_remove_intel_macos_ci branch January 16, 2023 11:09
@maflcko
Copy link
Copy Markdown
Member

maflcko commented Jan 16, 2023

lgtm. (Did the cherry-pick locally and checked that there was no overall diff in the last push)

@delta1 delta1 mentioned this pull request Aug 31, 2023
Merged
jamesdorfman added a commit to jamesdorfman/elements that referenced this pull request Sep 25, 2023
@jamesdorfman
Merge dd04f2d (Bitcoin PR bitcoin/bitcoin#26879)
c4f4b23
@bitcoin bitcoin locked and limited conversation to collaborators Jan 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@hebasto hebasto hebasto approved these changes

@maflcko maflcko Awaiting requested review from maflcko

Assignees

No one assigned

Labels

Backport

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@fanquake @DrahtBot @maflcko @hebasto