Skip to content

fix(ci): macOS runner for Intel #22134

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

Merged
merged 2 commits into from
Jan 7, 2025
Merged

fix(ci): macOS runner for Intel #22134

merged 2 commits into from
Jan 7, 2025

Conversation

pront
Copy link
Member

@pront pront commented Jan 7, 2025

Summary

macos-latest-xlarge is for ARM architecture based on https://docs.github.com/en/actions/using-github-hosted-runners/using-larger-runners/about-larger-runners.

This PR is an immediate fix. Will followup with another PR to add support for both ARM and Intel and fix the verification step.

Change Type

  • Bug fix
  • New feature
  • Non-functional (chore, refactoring, docs)
  • Performance

Is this a breaking change?

  • Yes
  • No

How did you test this PR?

Does this PR include user facing changes?

  • Yes. Please add a changelog fragment based on our guidelines.
  • No. A maintainer will apply the "no-changelog" label to this PR.

Checklist

  • Please read our Vector contributor resources.
  • If this PR introduces changes Vector dependencies (modifies Cargo.lock), please
    run dd-rust-license-tool write to regenerate the license inventory and commit the changes (if any). More details here.

References

Ref: #22129

@pront pront requested a review from a team as a code owner January 7, 2025 15:29
@pront pront added the no-changelog Changes in this PR do not need user-facing explanations in the release changelog label Jan 7, 2025
@pront pront enabled auto-merge January 7, 2025 15:29
@datadog-vectordotdev
Copy link

datadog-vectordotdev bot commented Jan 7, 2025

Datadog Report

Branch report: pront/fix-mac-intel
Commit report: 7f4efe4
Test service: vector

✅ 0 Failed, 7 Passed, 0 Skipped, 25.42s Total Time

@@ -268,7 +268,7 @@ jobs:

build-x86_64-apple-darwin-packages:
name: Build Vector for x86_64-apple-darwin (.tar.gz)
runs-on: macos-latest-xlarge
runs-on: macos-latest-large
Copy link
Member Author

Choose a reason for hiding this comment

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

The macos-verify job runs on [macos-14, macos-15]. I wonder if it should just run on macos-latest-large.

Copy link
Member

Choose a reason for hiding this comment

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

I think the macos-verify job will fail with this update, no?, due to the CPU architecture not matching.

Copy link
Member Author

@pront pront Jan 7, 2025

Choose a reason for hiding this comment

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

Fixed in a6c75ac. Note that removes checks on specific versions. I think that is a bigger task to be addressed by a release automation effort.

Ref: #21721

@pront pront disabled auto-merge January 7, 2025 15:43
Copy link
Member

@jszwedko jszwedko left a comment

Choose a reason for hiding this comment

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

I think we need to update the macos-verify job too, but otherwise 👍

@pront pront added this pull request to the merge queue Jan 7, 2025
Merged via the queue into master with commit d78f968 Jan 7, 2025
69 checks passed
@pront pront deleted the pront/fix-mac-intel branch January 7, 2025 19:12
@pront pront mentioned this pull request Jan 7, 2025
10 tasks
titaneric pushed a commit to titaneric/vector that referenced this pull request Jan 9, 2025
* fix(ci): macOS runner for Intel

* fix macos-verify
titaneric pushed a commit to titaneric/vector that referenced this pull request Jan 15, 2025
* fix(ci): macOS runner for Intel

* fix macos-verify
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-changelog Changes in this PR do not need user-facing explanations in the release changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants