Drop macOS-amd64 support

.github/matrix_includes_buildmgr.json

@@ -1,14 +1,4 @@
 [
-    {
-        "runs_on":"macos-15-intel",
-        "target":"darwin",
-        "arch": "amd64",
-        "binary_extension":".mac-amd64",
-        "arm_gcc_install_base": "https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4",
-        "installer_name": "gcc-arm-none-eabi-10-2020-q4-major-mac.tar.bz2",
-        "toolchain_root": "gcc-arm-none-eabi-10-2020-q4-major/bin",
-        "runOn": "publicRepo"
-    },
     {
         "runs_on":"macos-14",
         "target":"darwin",

.github/matrix_includes_packchk.json

@@ -1,11 +1,4 @@
 [
-    {
-        "runs_on":"macos-15-intel",
-        "target":"darwin",
-        "arch": "amd64",
-        "runOn": "publicRepo",
-        "binary": "packchk"
-    },
     {
         "runs_on":"macos-14",
         "target":"darwin",

.github/matrix_includes_packgen.json

@@ -1,12 +1,4 @@
 [
-    {
-        "runs_on":"macos-15-intel",
-        "target":"darwin",
-        "arch": "amd64",
-        "binary": "packgen",
-        "runOn": "publicRepo"
-
-    },
     {
         "runs_on":"macos-14",
         "target":"darwin",

.github/matrix_includes_projmgr.json

@@ -1,13 +1,4 @@
 [
-    {
-        "runs_on":"macos-15-intel",
-        "target":"darwin",
-        "arch": "amd64",
-        "binary": "csolution",
-        "runOn": "publicRepo",
-        "pyswig": true,
-        "goswig": true
-    },
     {
         "runs_on":"macos-14",
         "target":"darwin",

.github/matrix_includes_svdconv.json

@@ -1,11 +1,4 @@
 [
-    {
-        "runs_on":"macos-15-intel",
-        "target":"darwin",
-        "arch": "amd64",
-        "runOn": "publicRepo",
-        "binary": "svdconv"
-    },
     {
         "runs_on":"macos-14",
         "target":"darwin",

.github/matrix_includes_test_libs.json

@@ -1,10 +1,4 @@
 [
-    {
-        "runs_on":"macos-15-intel",
-        "target":"darwin",
-        "arch": "amd64",
-        "runOn": "publicRepo"
-    },
     {
         "runs_on":"macos-14",
         "target":"darwin",

.github/workflows/buildmgr.yml

@@ -263,13 +263,6 @@ jobs:
           name: cbuildgen-linux-arm64
           path: tools/buildmgr/cbuildgen/distribution/bin/
 
-      - name: Download cbuildgen macos-amd64
-        if: ${{ !github.event.repository.private }}
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: cbuildgen-darwin-amd64
-          path: tools/buildmgr/cbuildgen/distribution/bin/
-
       - name: Download cbuildgen macos-arm64
         if: ${{ !github.event.repository.private }}
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -478,11 +471,6 @@ jobs:
         run: /usr/bin/qemu-aarch64 -L /usr/aarch64-linux-gnu ./tools/buildmgr/test/integrationtests/${{ matrix.target }}-${{ matrix.arch }}/Debug/CbuildIntegTests --gtest_filter=-*AC5*:*AC6*:*MultiTargetAC6Tests* --gtest_output=xml:test_reports/cbuildintegtests-report-${{ matrix.target }}-${{ matrix.arch }}.xml
         working-directory: build
 
-      - name: Run Cbuild Integration Tests (excl. DebPkgTests, AC5, AC6, MultiTargetAC6Tests) for macOS
-        if: ${{ startsWith(matrix.runs_on, 'macos') && matrix.arch == 'amd64' }}
-        run: ./tools/buildmgr/test/integrationtests/${{ matrix.target }}-${{ matrix.arch }}/Debug/CbuildIntegTests --gtest_filter=-*DebPkgTests*:*AC5*:*AC6*:*MultiTargetAC6Tests* --gtest_output=xml:test_reports/cbuildintegtests-report-${{ matrix.target }}-${{ matrix.arch }}.xml
-        working-directory: build
-
       - 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
@@ -669,6 +657,7 @@ jobs:
           echo "$AC5_TOOLCHAIN_ROOT" >> config
           echo "$GCC_TOOLCHAIN_ROOT" >> config
           ./cbuild_install.sh < config
+
       - name: Test cbuildgen
         shell: bash
         run: |

.github/workflows/packgen.yml

@@ -148,12 +148,6 @@ jobs:
           name: packgen-linux-arm64
           path: tools/packgen/distribution/bin/linux-arm64/
 
-      - name: Download packgen macos-amd64
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: packgen-darwin-amd64
-          path: tools/packgen/distribution/bin/darwin-amd64/
-
       - name: Download packgen macos-arm64
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:

.github/workflows/projmgr.yml

@@ -247,12 +247,6 @@ jobs:
           name: projmgr-linux-arm64
           path: tools/projmgr/distribution/bin/linux-arm64/
 
-      - name: Download projmgr macos-amd64
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: projmgr-darwin-amd64
-          path: tools/projmgr/distribution/bin/darwin-amd64/
-
       - name: Download projmgr macos-arm64
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
@@ -277,13 +271,6 @@ jobs:
           name: projmgr-swig-python-linux-amd64
           path: tools/projmgr/distribution/lib/linux-amd64/python/
 
-      - name: Download projmgr-swig-python macos-amd64
-        if: ${{ !github.event.repository.private }}
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: projmgr-swig-python-darwin-amd64
-          path: tools/projmgr/distribution/lib/darwin-amd64/python/
-
       - name: Download projmgr-swig-python windows-amd64
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
@@ -296,13 +283,6 @@ jobs:
           name: projmgr-swig-go-linux-amd64
           path: tools/projmgr/distribution/lib/linux-amd64/go/
 
-      - name: Download projmgr-swig-go macos-amd64
-        if: ${{ !github.event.repository.private }}
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: projmgr-swig-go-darwin-amd64
-          path: tools/projmgr/distribution/lib/darwin-amd64/go/
-
       - name: Zip distribution folder
         run: zip -r projmgr.zip *
         working-directory: tools/projmgr/distribution
@@ -328,13 +308,6 @@ jobs:
           name: unit_test_result_projmgr-linux-amd64
           path: tools/testreport/linux-amd64/
 
-      - name: Download test report macos-amd64
-        if: ${{ !github.event.repository.private }}
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: unit_test_result_projmgr-darwin-amd64
-          path: tools/testreport/darwin-amd64/
-
       - name: Zip test reports
         run: zip -r testreport.zip *
         working-directory: tools/testreport

tools/buildmgr/cbuildgen/installer/create_installer.sh

@@ -154,8 +154,7 @@ case $OS in
     extn="exe-${arch}"
     ;;
   'Darwin')
-    # darwin arm64 native support is not available yet, temporary using amd64 instead
-    extn="mac-amd64"
+    extn="mac-${arch}"
     ;;
   *)
     echo "[ERROR] Unsupported OS $OS"

tools/buildmgr/cbuildgen/installer/install.sh

@@ -289,8 +289,7 @@ case $OS in
     remove_bin ${install_dir}
     ;;
   'Darwin')
-    # darwin arm64 native support is not available yet, temporary using amd64 instead
-    extn="mac-amd64"
+    extn="mac-${arch}"
     for f in "${install_dir}"/bin/*.${extn}; do
       mv "$f" "${f%.${extn}}"
     done