Skip to content

feat(codebuild): add support for macOS 15 runners#35836

Merged
mergify[bot] merged 3 commits intoaws:mainfrom
ayush-panta:add-macos15-codebuild
Dec 10, 2025
Merged

feat(codebuild): add support for macOS 15 runners#35836
mergify[bot] merged 3 commits intoaws:mainfrom
ayush-panta:add-macos15-codebuild

Conversation

@ayush-panta
Copy link
Copy Markdown
Contributor

@ayush-panta ayush-panta commented Oct 24, 2025

Reason for this change

Although CodeBuild supports the macOS base:15 image (ref), the CDK does not support this.

Description of changes

I added an option for the BASE_15 image. This simply involved copying the logic for BASE_14 and changing 14 to 15.

Describe any new or updated permissions being added

NA.

Description of how you validated changes

I added unit and integration tests for the base:15 image following the example of the existing tests for the base:14 image.

Unit tests (aws-codebuild/test/project.test.ts) passed locally:

    ✓ has build image for Base 14 (32 ms)
    ✓ has build image for Base 15 (12 ms)
    ✓ can set macOS fleet with BASE_14 (11 ms)
    ✓ can set macOS fleet with BASE_15 (10 ms)
    ✓ can set imported macOS fleet with BASE_14 (11 ms)
    ✓ can set imported macOS fleet with BASE_15 (11 ms)

The integration tests (aws-codebuild/test/integ.project-macos-fleet-base{14/15}.js) were not as straightforward. In the CodeBuild stack logs in my console, the stacks were able to be created successfully but failed to delete. I believe this is expected with macOS fleets and for these test cases, especially as the base:14 test already existed in the codebase. I have included snapshots, as required.

Checklist


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@aws-cdk-automation aws-cdk-automation requested a review from a team October 24, 2025 06:41
@github-actions github-actions bot added beginning-contributor [Pilot] contributed between 0-2 PRs to the CDK p2 labels Oct 24, 2025
Copy link
Copy Markdown
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

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

(This review is outdated)

@ayush-panta ayush-panta changed the title feat(codebuild): Add support for macOS 15 CodeBuild runners feat(codebuild): add support for macOS 15 CodeBuild runners Oct 24, 2025
@aws-cdk-automation aws-cdk-automation dismissed their stale review October 24, 2025 07:01

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

@ayush-panta
Copy link
Copy Markdown
Contributor Author

ayush-panta commented Oct 24, 2025

Though the automated validation passes, I still have to add a snapshot for the base15 integration test.

Update: generated and added.

@ayush-panta
Copy link
Copy Markdown
Contributor Author

Hello, just bumping this PR.

@ozelalisen ozelalisen self-assigned this Dec 3, 2025
@mergify mergify bot dismissed ozelalisen’s stale review December 9, 2025 21:54

Pull request has been modified.

@ayush-panta ayush-panta changed the title feat(codebuild): add support for macOS 15 CodeBuild runners feat(codebuild): add support for macOS 15 runners Dec 9, 2025
Signed-off-by: ayush-panta <ayushkp@amazon.com>
@ayush-panta ayush-panta force-pushed the add-macos15-codebuild branch from 19389fe to f1cae44 Compare December 9, 2025 22:31
@ayush-panta
Copy link
Copy Markdown
Contributor Author

ayush-panta commented Dec 9, 2025

Hi @ozelalisen, thank you for your suggestions. I've made the necessary changes.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Dec 10, 2025

TestsPassed ☑️SkippedFailed ❌️
Security Guardian Results104 ran100 passed4 failed
TestResult
Security Guardian Results
packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-macos-fleet-base14.js.snapshot/MacOsProjectIntegTestDefaultTestDeployAssertB425ECC4.template.json
iam-no-wildcard-actions-inline.guard❌ failure
packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-macos-fleet-base14.js.snapshot/aws-cdk-project-macos-base14.template.json
iam-no-wildcard-actions-inline.guard❌ failure
packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-macos-fleet-base15.js.snapshot/MacOsProjectIntegTestDefaultTestDeployAssertB425ECC4.template.json
iam-no-wildcard-actions-inline.guard❌ failure
packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-macos-fleet-base15.js.snapshot/aws-cdk-project-macos-base15.template.json
iam-no-wildcard-actions-inline.guard❌ failure

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Dec 10, 2025

TestsPassed ☑️SkippedFailed ❌️
Security Guardian Results with resolved templates104 ran100 passed4 failed
TestResult
Security Guardian Results with resolved templates
packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-macos-fleet-base14.js.snapshot/MacOsProjectIntegTestDefaultTestDeployAssertB425ECC4.template.json
iam-no-wildcard-actions-inline.guard❌ failure
packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-macos-fleet-base14.js.snapshot/aws-cdk-project-macos-base14.template.json
iam-no-wildcard-actions-inline.guard❌ failure
packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-macos-fleet-base15.js.snapshot/MacOsProjectIntegTestDefaultTestDeployAssertB425ECC4.template.json
iam-no-wildcard-actions-inline.guard❌ failure
packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.project-macos-fleet-base15.js.snapshot/aws-cdk-project-macos-base15.template.json
iam-no-wildcard-actions-inline.guard❌ failure

@aws-cdk-automation aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Dec 10, 2025
@ozelalisen ozelalisen added the pr/needs-integration-tests-deployment Requires the PR to deploy the integration test snapshots. label Dec 10, 2025
@ozelalisen ozelalisen had a problem deploying to deployment-integ-test December 10, 2025 10:06 — with GitHub Actions Failure
@ozelalisen ozelalisen removed the pr/needs-integration-tests-deployment Requires the PR to deploy the integration test snapshots. label Dec 10, 2025
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Dec 10, 2025

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Dec 10, 2025

Merge Queue Status

🚫 The pull request has left the queue (rule: default-squash) at f1cae44

This pull request spent 4 seconds in the queue, with no time running CI.

Reason

The pull request can't be updated

For security reasons, Mergify can't update this pull request. Try updating locally.
GitHub response: refusing to allow a GitHub App to create or update workflow .github/workflows/issue-label-assign.yml without workflows permission

Hint

You should update or rebase your pull request manually. If you do, this pull request will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Dec 10, 2025

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Dec 10, 2025

Merge Queue Status

✅ The pull request has been merged at 1f0a1d3

This pull request spent 5 hours 59 minutes 45 seconds in the queue, including 5 hours 59 minutes 35 seconds running CI.
The checks were run in-place.

Required conditions to merge

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Dec 10, 2025

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit 1b8b4e3 into aws:main Dec 10, 2025
19 of 23 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 10, 2025
@aws-cdk-automation aws-cdk-automation removed the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Dec 10, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

beginning-contributor [Pilot] contributed between 0-2 PRs to the CDK p2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants