Skip to content

Drop macOS-amd64 support#2507

Open
soumeh01 wants to merge 6 commits into
mainfrom
drop-macos-amd64
Open

Drop macOS-amd64 support#2507
soumeh01 wants to merge 6 commits into
mainfrom
drop-macos-amd64

Conversation

@soumeh01

@soumeh01 soumeh01 commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Fixes

Checklist

  • 🤖 This change is covered by unit tests (if applicable).
  • 🤹 Manual testing has been performed (if necessary).
  • 🛡️ Security impacts have been considered (if relevant).
  • 📖 Documentation updates are complete (if required).
  • 🧠 Third-party dependencies and TPIP updated (if required).

@github-actions

github-actions Bot commented Jun 29, 2026

Copy link
Copy Markdown

Test Results

  2 files   -    56   14 suites   - 162   16m 15s ⏱️ - 7m 12s
474 tests  -   451  474 ✅  -   434  0 💤  - 17  0 ❌ ±0 
948 runs   - 1 964  948 ✅  - 1 896  0 💤  - 68  0 ❌ ±0 

Results for commit eaebd1f. ± Comparison against base commit 33fac87.

This pull request removes 451 tests.
AuxCmdTests ‑ MkdirCmdTest
AuxCmdTests ‑ RmdirCmdTest
AuxCmdTests ‑ TouchCmdTest
BuildSystemGeneratorTests ‑ GenAuditFile
BuildSystemGeneratorTests ‑ GenAuditFile_WithOut_Existing_Audit_File
BuildSystemGeneratorTests ‑ GenAuditFile_With_Existing_Audit_File
BuildSystemGeneratorTests ‑ GetString
BuildSystemGeneratorTests ‑ StrConv
BuildSystemGeneratorTests ‑ StrNorm
CBuildGCCTests ‑ Asm
…

♻️ This comment has been updated with latest results.

@soumeh01 soumeh01 marked this pull request as ready for review June 29, 2026 14:34
@codecov

codecov Bot commented Jun 29, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 65.29%. Comparing base (33fac87) to head (eaebd1f).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2507   +/-   ##
=======================================
  Coverage   65.29%   65.29%           
=======================================
  Files         147      147           
  Lines       26702    26702           
  Branches    16184    16184           
=======================================
  Hits        17435    17435           
- Misses       7069     7073    +4     
+ Partials     2198     2194    -4     
Flag Coverage Δ
buildmgr-cov 79.87% <ø> (ø)
packchk-cov 69.75% <ø> (ø)
packgen-cov 82.02% <ø> (ø)
projmgr-cov 88.00% <ø> (ø)
svdconv-cov 40.28% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 1 file with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Removes macOS Intel (amd64) coverage from the CI/release pipelines and updates the CMSIS Build installer logic to select macOS binaries by detected architecture rather than always using amd64.

Changes:

  • Update installer scripts to use mac-${arch} on Darwin instead of hardcoding mac-amd64.
  • Remove macOS-amd64 artifact downloads from release packaging workflows.
  • Drop macos-15-intel (amd64) entries from GitHub Actions test matrices.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
tools/buildmgr/cbuildgen/installer/install.sh Switch macOS install suffix selection from fixed amd64 to ${arch}.
tools/buildmgr/cbuildgen/installer/create_installer.sh Switch macOS suffix used for version detection from fixed amd64 to ${arch}.
.github/workflows/projmgr.yml Stop packaging/downloading macOS-amd64 artifacts for projmgr release bundles.
.github/workflows/packgen.yml Stop packaging/downloading macOS-amd64 artifacts for packgen release bundles.
.github/workflows/buildmgr.yml Stop packaging/downloading macOS-amd64 cbuildgen artifacts and remove macOS-amd64 integration-test run step.
.github/matrix_includes_test_libs.json Remove macOS Intel (amd64) runner entry from test libs matrix includes.
.github/matrix_includes_svdconv.json Remove macOS Intel (amd64) runner entry from svdconv matrix includes.
.github/matrix_includes_projmgr.json Remove macOS Intel (amd64) runner entry from projmgr matrix includes.
.github/matrix_includes_packgen.json Remove macOS Intel (amd64) runner entry from packgen matrix includes.
.github/matrix_includes_packchk.json Remove macOS Intel (amd64) runner entry from packchk matrix includes.
.github/matrix_includes_buildmgr.json Remove macOS Intel (amd64) runner entry from buildmgr matrix includes.
Comments suppressed due to low confidence (2)

tools/buildmgr/cbuildgen/installer/install.sh:297

  • On macOS, this now selects binaries based on ${arch}, which is good for arm64, but if macOS-amd64 support is being dropped then running the installer on an Intel Mac will silently fail to install expected binaries. Also, remove_bin ${install_dir} is unquoted and will break if the install path contains spaces.

Consider explicitly erroring out on arch==amd64 for Darwin and quote the remove_bin argument to avoid word-splitting.

  'Darwin')
    extn="mac-${arch}"
    for f in "${install_dir}"/bin/*.${extn}; do
      mv "$f" "${f%.${extn}}"
    done
    remove_bin ${install_dir}
    chmod -R +x "${install_dir}"/bin

.github/workflows/buildmgr.yml:477

  • This workflow no longer runs Cbuild integration tests on macOS after removing the macos && arch==amd64 step. Since the matrix still includes macOS (macos-14, arch: arm64), the macOS jobs now build CbuildIntegTests but never execute them.

If macOS arm64 is still a supported target, add an integration-test run step for macos && arch==arm64 (similar to the previous macOS amd64 step).

      - name: Run Cbuild Integration Tests (excl. DebPkgTests, AC5, AC6, MultiTargetAC6Tests) for Windows
        if: ${{ startsWith(matrix.runs_on, 'windows') && matrix.arch == 'amd64' }}
        run: .\tools\buildmgr\test\integrationtests\${{ matrix.target }}-${{ matrix.arch }}\Debug\CbuildIntegTests.exe --gtest_filter=-*DebPkgTests*:*AC5*:*AC6*:*MultiTargetAC6Tests* --gtest_output=xml:test_reports/cbuildintegtests-report-${{ matrix.target }}-${{ matrix.arch }}.xml
        working-directory: build

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines 156 to 158
'Darwin')
# darwin arm64 native support is not available yet, temporary using amd64 instead
extn="mac-amd64"
extn="mac-${arch}"
;;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants