Skip to content

Commit 00e0d47

Browse files
sergcppsergcpp
committed
Run macos tests on CI
1 parent f463ccc commit 00e0d47

File tree

6 files changed

+349
-346
lines changed

6 files changed

+349
-346
lines changed

‎.gitea/workflows/ci.yml‎

Lines changed: 104 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,26 @@ jobs:
6464
with:
6565
name: linux-x86_64
6666
path: linux-x86_64/
67-
# build-macos-universal-rel:
68-
# runs-on: [ macos, builder ]
69-
# steps:
70-
# - name: Checkout Workflows
71-
# uses: actions/checkout@v4
72-
# with:
73-
# sparse-checkout: .gitea
74-
# - name: Re-initialize repository
75-
# uses: ./.gitea/actions/checkout
76-
# - name: Compile the code
77-
# uses: ./.gitea/actions/build-macos
78-
# with:
79-
# cmake-args: '-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_UNITY_BUILD=ON'
80-
# config: "Release"
81-
# bin-dir: "macos-universal"
82-
# - name: Upload artifacts
83-
# uses: actions/upload-artifact@v3
84-
# with:
85-
# name: macos-universal
86-
# path: macos-universal/
67+
build-macos-universal-rel:
68+
runs-on: [ macos, builder ]
69+
steps:
70+
- name: Checkout Workflows
71+
uses: actions/checkout@v4
72+
with:
73+
sparse-checkout: .gitea
74+
- name: Re-initialize repository
75+
uses: ./.gitea/actions/checkout
76+
- name: Compile the code
77+
uses: ./.gitea/actions/build-macos
78+
with:
79+
cmake-args: '-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_UNITY_BUILD=ON'
80+
config: "Release"
81+
bin-dir: "macos-universal"
82+
- name: Upload artifacts
83+
uses: actions/upload-artifact@v3
84+
with:
85+
name: macos-universal
86+
path: macos-universal/
8787
test-windows-x86_64-cpu:
8888
runs-on: [ windows, x86_64 ]
8989
needs:
@@ -314,79 +314,79 @@ jobs:
314314
with:
315315
name: linux-x86_64-gpu-nv-output
316316
path: linux-x86_64-gpu-nv-output/
317-
# test-macos-arm64-cpu:
318-
# runs-on: [ macos, arm64 ]
319-
# needs:
320-
# - build-macos-universal-rel
321-
# steps:
322-
# - name: Checkout Workflows
323-
# uses: actions/checkout@v4
324-
# with:
325-
# sparse-checkout: .gitea
326-
# - name: Re-initialize repository
327-
# uses: ./.gitea/actions/checkout
328-
# - name: Run Tests
329-
# uses: ./.gitea/actions/test
330-
# with:
331-
# bin-dir: "macos-universal"
332-
# out-dir: "macos-arm64-cpu-output"
333-
# test-args: "--nogpu -j4"
334-
# - name: Upload artifacts
335-
# uses: actions/upload-artifact@v3
336-
# if: always()
337-
# with:
338-
# name: macos-arm64-cpu-output
339-
# path: macos-arm64-cpu-output/
340-
# test-macos-arm64-gpu-m1:
341-
# runs-on: [ macos, arm64, m1 ]
342-
# needs:
343-
# - build-macos-universal-rel
344-
# steps:
345-
# - name: Checkout Workflows
346-
# uses: actions/checkout@v4
347-
# with:
348-
# sparse-checkout: .gitea
349-
# - name: Re-initialize repository
350-
# uses: ./.gitea/actions/checkout
351-
# - name: Run Tests
352-
# uses: ./.gitea/actions/test
353-
# with:
354-
# bin-dir: "macos-universal"
355-
# out-dir: "macos-arm64-gpu-m1-output"
356-
# test-args: "--device M1 --nocpu"
357-
# - name: Upload artifacts
358-
# uses: actions/upload-artifact@v3
359-
# if: always()
360-
# with:
361-
# name: macos-arm64-gpu-m1-output
362-
# path: macos-arm64-gpu-m1-output/
363-
# test-macos-x86_64-cpu:
364-
# runs-on: [ macos, x86_64 ]
365-
# needs:
366-
# - build-macos-universal-rel
367-
# steps:
368-
# - name: Checkout Workflows
369-
# uses: actions/checkout@v4
370-
# with:
371-
# sparse-checkout: .gitea
372-
# - name: Re-initialize repository
373-
# uses: ./.gitea/actions/checkout
374-
# - name: Run Tests
375-
# uses: ./.gitea/actions/test-macos
376-
# with:
377-
# arch: "-x86_64"
378-
# bin-dir: "macos-universal"
379-
# out-dir: "macos-x86_64-cpu-output"
380-
# test-args: "--nogpu -j4"
381-
# - name: Upload artifacts
382-
# uses: actions/upload-artifact@v3
383-
# if: always()
384-
# with:
385-
# name: macos-x86_64-cpu-output
386-
# path: macos-x86_64-cpu-output/
317+
test-macos-arm64-cpu:
318+
runs-on: [ macos, arm64 ]
319+
needs:
320+
- build-macos-universal-rel
321+
steps:
322+
- name: Checkout Workflows
323+
uses: actions/checkout@v4
324+
with:
325+
sparse-checkout: .gitea
326+
- name: Re-initialize repository
327+
uses: ./.gitea/actions/checkout
328+
- name: Run Tests
329+
uses: ./.gitea/actions/test
330+
with:
331+
bin-dir: "macos-universal"
332+
out-dir: "macos-arm64-cpu-output"
333+
test-args: "--nogpu -j4"
334+
- name: Upload artifacts
335+
uses: actions/upload-artifact@v3
336+
if: always()
337+
with:
338+
name: macos-arm64-cpu-output
339+
path: macos-arm64-cpu-output/
340+
test-macos-arm64-gpu-m4:
341+
runs-on: [ macos, arm64, m4 ]
342+
needs:
343+
- build-macos-universal-rel
344+
steps:
345+
- name: Checkout Workflows
346+
uses: actions/checkout@v4
347+
with:
348+
sparse-checkout: .gitea
349+
- name: Re-initialize repository
350+
uses: ./.gitea/actions/checkout
351+
- name: Run Tests
352+
uses: ./.gitea/actions/test
353+
with:
354+
bin-dir: "macos-universal"
355+
out-dir: "macos-arm64-gpu-m4-output"
356+
test-args: "--device M4 --nocpu"
357+
- name: Upload artifacts
358+
uses: actions/upload-artifact@v3
359+
if: always()
360+
with:
361+
name: macos-arm64-gpu-m4-output
362+
path: macos-arm64-gpu-m4-output/
363+
test-macos-x86_64-cpu:
364+
runs-on: [ macos, x86_64 ]
365+
needs:
366+
- build-macos-universal-rel
367+
steps:
368+
- name: Checkout Workflows
369+
uses: actions/checkout@v4
370+
with:
371+
sparse-checkout: .gitea
372+
- name: Re-initialize repository
373+
uses: ./.gitea/actions/checkout
374+
- name: Run Tests
375+
uses: ./.gitea/actions/test-macos
376+
with:
377+
arch: "-x86_64"
378+
bin-dir: "macos-universal"
379+
out-dir: "macos-x86_64-cpu-output"
380+
test-args: "--nogpu -j4"
381+
- name: Upload artifacts
382+
uses: actions/upload-artifact@v3
383+
if: always()
384+
with:
385+
name: macos-x86_64-cpu-output
386+
path: macos-x86_64-cpu-output/
387387
analyze-output:
388388
runs-on: [ linux ]
389-
needs: [ test-windows-x86_64-cpu, test-windows-x86_64-gpu-amd, test-windows-x86_64-gpu-uhd, test-windows-x86_64-gpu-arc, test-linux-x86_64-cpu, test-linux-x86_64-gpu-nv ]
389+
needs: [ test-windows-x86_64-cpu, test-windows-x86_64-gpu-amd, test-windows-x86_64-gpu-uhd, test-windows-x86_64-gpu-arc, test-linux-x86_64-cpu, test-linux-x86_64-gpu-nv, test-macos-arm64-cpu, test-macos-arm64-gpu-m4, test-macos-x86_64-cpu ]
390390
if: always()
391391
steps:
392392
- name: Checkout Workflows
@@ -433,19 +433,19 @@ jobs:
433433
with:
434434
name: linux-x86_64-gpu-nv-output
435435
path: linux-x86_64-gpu-nv-output/
436-
# - uses: actions/download-artifact@v3
437-
# with:
438-
# name: macos-arm64-cpu-output
439-
# path: macos-arm64-cpu-output/
440-
# - uses: actions/download-artifact@v3
441-
# with:
442-
# name: macos-arm64-gpu-m1-output
443-
# path: macos-arm64-gpu-m1-output/
444-
# - uses: actions/download-artifact@v3
445-
# with:
446-
# name: macos-x86_64-cpu-output
447-
# path: macos-x86_64-cpu-output/
436+
- uses: actions/download-artifact@v3
437+
with:
438+
name: macos-arm64-cpu-output
439+
path: macos-arm64-cpu-output/
440+
- uses: actions/download-artifact@v3
441+
with:
442+
name: macos-arm64-gpu-m4-output
443+
path: macos-arm64-gpu-m4-output/
444+
- uses: actions/download-artifact@v3
445+
with:
446+
name: macos-x86_64-cpu-output
447+
path: macos-x86_64-cpu-output/
448448
- name: Analyze Output
449449
run: |
450-
python scripts/analyze_output.py windows-x86_64-cpu-output/test_Ray_output.txt windows-x86_64-gpu-amd-output/test_Ray_output.txt windows-x86_64-gpu-uhd-output/test_Ray_output.txt windows-x86_64-gpu-arc-output/test_Ray_output.txt linux-x86_64-cpu-output/test_Ray_output.txt linux-x86_64-gpu-nv-output/test_Ray_output.txt
450+
python scripts/analyze_output.py windows-x86_64-cpu-output/test_Ray_output.txt windows-x86_64-gpu-amd-output/test_Ray_output.txt windows-x86_64-gpu-uhd-output/test_Ray_output.txt windows-x86_64-gpu-arc-output/test_Ray_output.txt linux-x86_64-cpu-output/test_Ray_output.txt linux-x86_64-gpu-nv-output/test_Ray_output.txt macos-arm64-cpu-output/test_Ray_output.txt macos-arm64-gpu-m4-output/test_Ray_output.txt macos-x86_64-cpu-output/test_Ray_output.txt
451451
shell: bash

0 commit comments

Comments
 (0)