Skip to content

Commit 26691ce

Browse files
committed
Drop macOS-amd64 support
1 parent 36dcd6d commit 26691ce

9 files changed

Lines changed: 0 additions & 92 deletions

.github/matrix_includes_buildmgr.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
[
2-
{
3-
"runs_on":"macos-15-intel",
4-
"target":"darwin",
5-
"arch": "amd64",
6-
"binary_extension":".mac-amd64",
7-
"arm_gcc_install_base": "https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4",
8-
"installer_name": "gcc-arm-none-eabi-10-2020-q4-major-mac.tar.bz2",
9-
"toolchain_root": "gcc-arm-none-eabi-10-2020-q4-major/bin",
10-
"runOn": "publicRepo"
11-
},
122
{
133
"runs_on":"macos-14",
144
"target":"darwin",

.github/matrix_includes_packchk.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
[
2-
{
3-
"runs_on":"macos-15-intel",
4-
"target":"darwin",
5-
"arch": "amd64",
6-
"runOn": "publicRepo",
7-
"binary": "packchk"
8-
},
92
{
103
"runs_on":"macos-14",
114
"target":"darwin",

.github/matrix_includes_packgen.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
[
2-
{
3-
"runs_on":"macos-15-intel",
4-
"target":"darwin",
5-
"arch": "amd64",
6-
"binary": "packgen",
7-
"runOn": "publicRepo"
8-
9-
},
102
{
113
"runs_on":"macos-14",
124
"target":"darwin",

.github/matrix_includes_projmgr.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
[
2-
{
3-
"runs_on":"macos-15-intel",
4-
"target":"darwin",
5-
"arch": "amd64",
6-
"binary": "csolution",
7-
"runOn": "publicRepo",
8-
"pyswig": true,
9-
"goswig": true
10-
},
112
{
123
"runs_on":"macos-14",
134
"target":"darwin",

.github/matrix_includes_svdconv.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
[
2-
{
3-
"runs_on":"macos-15-intel",
4-
"target":"darwin",
5-
"arch": "amd64",
6-
"runOn": "publicRepo",
7-
"binary": "svdconv"
8-
},
92
{
103
"runs_on":"macos-14",
114
"target":"darwin",

.github/matrix_includes_test_libs.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
[
2-
{
3-
"runs_on":"macos-15-intel",
4-
"target":"darwin",
5-
"arch": "amd64",
6-
"runOn": "publicRepo"
7-
},
82
{
93
"runs_on":"macos-14",
104
"target":"darwin",

.github/workflows/buildmgr.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -263,13 +263,6 @@ jobs:
263263
name: cbuildgen-linux-arm64
264264
path: tools/buildmgr/cbuildgen/distribution/bin/
265265

266-
- name: Download cbuildgen macos-amd64
267-
if: ${{ !github.event.repository.private }}
268-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
269-
with:
270-
name: cbuildgen-darwin-amd64
271-
path: tools/buildmgr/cbuildgen/distribution/bin/
272-
273266
- name: Download cbuildgen macos-arm64
274267
if: ${{ !github.event.repository.private }}
275268
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -478,11 +471,6 @@ jobs:
478471
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
479472
working-directory: build
480473

481-
- name: Run Cbuild Integration Tests (excl. DebPkgTests, AC5, AC6, MultiTargetAC6Tests) for macOS
482-
if: ${{ startsWith(matrix.runs_on, 'macos') && matrix.arch == 'amd64' }}
483-
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
484-
working-directory: build
485-
486474
- name: Run Cbuild Integration Tests (excl. DebPkgTests, AC5, AC6, MultiTargetAC6Tests) for Windows
487475
if: ${{ startsWith(matrix.runs_on, 'windows') && matrix.arch == 'amd64' }}
488476
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

.github/workflows/packgen.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,6 @@ jobs:
148148
name: packgen-linux-arm64
149149
path: tools/packgen/distribution/bin/linux-arm64/
150150

151-
- name: Download packgen macos-amd64
152-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
153-
with:
154-
name: packgen-darwin-amd64
155-
path: tools/packgen/distribution/bin/darwin-amd64/
156-
157151
- name: Download packgen macos-arm64
158152
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
159153
with:

.github/workflows/projmgr.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -247,12 +247,6 @@ jobs:
247247
name: projmgr-linux-arm64
248248
path: tools/projmgr/distribution/bin/linux-arm64/
249249

250-
- name: Download projmgr macos-amd64
251-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
252-
with:
253-
name: projmgr-darwin-amd64
254-
path: tools/projmgr/distribution/bin/darwin-amd64/
255-
256250
- name: Download projmgr macos-arm64
257251
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
258252
with:
@@ -277,13 +271,6 @@ jobs:
277271
name: projmgr-swig-python-linux-amd64
278272
path: tools/projmgr/distribution/lib/linux-amd64/python/
279273

280-
- name: Download projmgr-swig-python macos-amd64
281-
if: ${{ !github.event.repository.private }}
282-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
283-
with:
284-
name: projmgr-swig-python-darwin-amd64
285-
path: tools/projmgr/distribution/lib/darwin-amd64/python/
286-
287274
- name: Download projmgr-swig-python windows-amd64
288275
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
289276
with:
@@ -296,13 +283,6 @@ jobs:
296283
name: projmgr-swig-go-linux-amd64
297284
path: tools/projmgr/distribution/lib/linux-amd64/go/
298285

299-
- name: Download projmgr-swig-go macos-amd64
300-
if: ${{ !github.event.repository.private }}
301-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
302-
with:
303-
name: projmgr-swig-go-darwin-amd64
304-
path: tools/projmgr/distribution/lib/darwin-amd64/go/
305-
306286
- name: Zip distribution folder
307287
run: zip -r projmgr.zip *
308288
working-directory: tools/projmgr/distribution
@@ -328,13 +308,6 @@ jobs:
328308
name: unit_test_result_projmgr-linux-amd64
329309
path: tools/testreport/linux-amd64/
330310

331-
- name: Download test report macos-amd64
332-
if: ${{ !github.event.repository.private }}
333-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
334-
with:
335-
name: unit_test_result_projmgr-darwin-amd64
336-
path: tools/testreport/darwin-amd64/
337-
338311
- name: Zip test reports
339312
run: zip -r testreport.zip *
340313
working-directory: tools/testreport

0 commit comments

Comments
 (0)