this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Compile for MacOS arm64 in CI as well (#2528)

* compile to arm64 macos as well

* more fixes

* fix delete-pro

authored by

Alice and committed by
GitHub
712be942 e7ebc15a

+93 -2
+93 -2
.github/workflows/build.yml
··· 573 573 name: "tic80-macos-pro" 574 574 path: build/bin/tic80 575 575 576 + # === MacOS 14 / arm64 === 577 + macos-arm64: 578 + runs-on: macos-14 579 + 580 + steps: 581 + - uses: actions/checkout@v3 582 + with: 583 + submodules: recursive 584 + fetch-depth: 0 585 + 586 + - name: Install 587 + run: brew uninstall --ignore-dependencies libidn2 588 + 589 + - name: Build 590 + run: | 591 + cd build 592 + cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SDLGPU=On -DBUILD_STUB=On .. 593 + cmake --build . --config $BUILD_TYPE --parallel 594 + cpack 595 + cp *.dmg tic80.dmg 596 + 597 + - name: Deploy DMG 598 + uses: actions/upload-artifact@v3 599 + with: 600 + name: "tic80-macos-arm64-dmg" 601 + path: build/tic80.dmg 602 + 603 + - name: Deploy 604 + uses: actions/upload-artifact@v3 605 + with: 606 + name: "tic80-macos-arm64" 607 + path: build/bin/tic80 608 + 609 + - name: Deploy stubs 610 + uses: actions/upload-artifact@v3 611 + with: 612 + name: "tic80-macos-arm64-stub" 613 + path: build/bin/tic80* 614 + 615 + # === MacOS 14 / arm64 PRO === 616 + macos-arm64-pro: 617 + runs-on: macos-14 618 + 619 + steps: 620 + - uses: actions/checkout@v3 621 + with: 622 + submodules: recursive 623 + fetch-depth: 0 624 + 625 + - name: Install 626 + run: brew uninstall --ignore-dependencies libidn2 627 + 628 + - name: Build 629 + run: | 630 + cd build 631 + cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SDLGPU=On -DBUILD_PRO=On .. 632 + cmake --build . --config $BUILD_TYPE --parallel 633 + cpack 634 + cp *.dmg tic80.dmg 635 + 636 + - name: Deploy DMG 637 + uses: actions/upload-artifact@v3 638 + with: 639 + name: "tic80-macos-arm64-dmg-pro" 640 + path: build/tic80.dmg 641 + 642 + - name: Deploy 643 + uses: actions/upload-artifact@v3 644 + with: 645 + name: "tic80-macos-arm64-pro" 646 + path: build/bin/tic80 647 + 576 648 # === Android === 577 649 android: 578 650 runs-on: ubuntu-latest ··· 680 752 681 753 # === Export === 682 754 export: 683 - needs: [winxp, windows, linux, rpi, macos, html] 755 + needs: [winxp, windows, linux, rpi, macos, macos-arm64, html] 684 756 runs-on: ubuntu-latest 685 757 686 758 steps: ··· 714 786 name: tic80-macos 715 787 path: macdir 716 788 789 + - name: Download MacOS arm64 artifact 790 + uses: actions/download-artifact@v3 791 + with: 792 + name: tic80-macos-arm64 793 + path: macdir-arm64 794 + 717 795 - name: Download HTML artifact 718 796 uses: actions/download-artifact@v3 719 797 with: ··· 725 803 cp windir/* win 726 804 cp linuxdir/* linux 727 805 cp macdir/* mac 806 + cp macdir-arm64/* mac-arm64 728 807 cp rpidir/* rpi 729 808 mv -f export.html index.html 730 809 zip html.zip index.html tic80.js tic80.wasm ··· 739 818 win 740 819 linux 741 820 mac 821 + mac-arm64 742 822 rpi 743 823 html 744 824 ··· 781 861 name: tic80-macos-stub 782 862 path: macdir 783 863 864 + - name: Download MacOS arm64 artifact 865 + uses: actions/download-artifact@v3 866 + with: 867 + name: tic80-macos-arm64-stub 868 + path: macdir-arm64 869 + 784 870 - name: Download HTML artifact 785 871 uses: actions/download-artifact@v3 786 872 with: ··· 793 879 cp linuxdir/tic80${{ matrix.script }} linux${{ matrix.script }} 794 880 cp rpidir/tic80${{ matrix.script }} rpi${{ matrix.script }} 795 881 cp macdir/tic80${{ matrix.script }} mac${{ matrix.script }} 882 + cp macdir-arm64/tic80${{ matrix.script }} mac-arm64${{ matrix.script }} 796 883 mv -f tic80${{ matrix.script }}.js tic80.js 797 884 zip html${{ matrix.script }}.zip index.html tic80.js tic80${{ matrix.script }}.wasm 798 885 mv -f html${{ matrix.script }}.zip html${{ matrix.script }} ··· 807 894 linux${{ matrix.script }} 808 895 rpi${{ matrix.script }} 809 896 mac${{ matrix.script }} 897 + mac-arm64${{ matrix.script }} 810 898 html${{ matrix.script }} 811 899 812 900 # === Delete stub artifacts === ··· 824 912 tic80-linux-stub 825 913 tic80-rpi-stub 826 914 tic80-macos-stub 915 + tic80-macos-arm64-stub 827 916 tic80-html-stub 828 917 829 918 # === Delete PRO artifacts === 830 919 delete-pro: 831 - needs: [winxp-pro, windows-pro, linux-pro, macos-pro, rpi-pro] 920 + needs: [winxp-pro, windows-pro, linux-pro, macos-pro, macos-arm64-pro, rpi-pro] 832 921 runs-on: ubuntu-latest 833 922 834 923 steps: ··· 838 927 name: | 839 928 tic80-macos-pro 840 929 tic80-macos-dmg-pro 930 + tic80-macos-arm64-pro 931 + tic80-macos-arm64-dmg-pro 841 932 tic80-winxp-pro 842 933 tic80-windows-pro 843 934 tic80-linux-deb-pro