Love that you can't test CI without pushing

bbrk24 · Sep 14, 2023 · 7911aa6 · 7911aa6
1 parent 1261590
commit 7911aa6
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 12 deletions.
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
@@ -4,14 +4,32 @@ name: Build & Release Precompiled Binaries
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
 jobs:
-  build-unix:
+  build-ubuntu:
+    runs-on: ubuntu
+    name: Build for Ubuntu
+    steps:
+      - uses: actions/checkout@v4
+      - name: Compile C++ sources
+        shell: bash
+        run: >
+          mkdir Release/
+
+          tag=${{ github.ref_name }}
+
+          g++ -O3 -DNDEBUG -DVERSION=$tag -flto -fno-rtti -std=gnu++17 -o Release/trilangle-${tag}-ubuntu-latest
+          src/*.cpp
+      - uses: actions/upload-artifact@v3
+        with:
+          name: trilangle-ubuntu-latest
+          path: Release/
+  build-mac:
+    runs-on: macos-latest
     strategy:
       matrix:
-        os:
-          - ubuntu-latest
-          - macos-latest
-    runs-on: ${{ matrix.os }}
-    name: Build for ${{ matrix.os }}
+        arch:
+          - x86_64
+          - aarch64
+    name: Build for macOS ${{ matrix.arch }}
     steps:
       - uses: actions/checkout@v4
       - name: Compile C++ sources
@@ -21,11 +39,11 @@ jobs:
 
           tag=${{ github.ref_name }}
 
-          g++ -O3 -DNDEBUG -DVERSION=$tag -flto -fno-rtti -std=gnu++17 -o Release/trilangle-${tag}-${{ matrix.os }}
-          src/*.cpp
+          clang++ -O3 -DNDEBUG -DVERSION=$tag -flto -fno-rtti -std=gnu++20 -target ${{ matrix.arch }}-apple-macosx -o
+          Release/trilangle-${tag}-macos-latest-${{ matrix.arch }} src/*.cpp
       - uses: actions/upload-artifact@v3
         with:
-          name: trilangle-${{ matrix.os }}
+          name: trilangle-macos-latest-${{ matrix.arch }}
           path: Release/
   build-windows:
     name: Build for Windows
@@ -50,7 +68,8 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     needs:
-      - build-unix
+      - build-ubuntu
+      - build-mac
       - build-windows
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/lint-build.yml b/.github/workflows/lint-build.yml
@@ -14,14 +14,19 @@ name: Lint Builds
 jobs:
   build-native-mac:
     runs-on: macos-latest
-    name: Verify C++ Build with clang
+    strategy:
+      matrix:
+        arch:
+          - x86_64
+          - aarch64
+    name: Verify C++ Build with clang on ${{ matrix.arch }}
     steps:
       - uses: actions/checkout@v4
       - name: Invoke clang
         shell: bash
         run: >+
           clang++ -DVERSION=0.0.0 -DNDEBUG -WCL4 -Wnon-gcc -Wimplicit-fallthrough -Werror -std=c++14 -o /dev/null
-          src/*.cpp
+          -target ${{ matrix.arch }}-apple-macosx src/*.cpp
   build-native-windows:
     runs-on: windows-latest
     name: Verify C++ Build with MSVC

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. See [Keep a
 
 ### Added
 
+- Added prebuilt binaries for ARM64 macOS.
 - Added a 'play' feature to the online debugger, to automatically step through the code.
 
 ## [1.5.0] - 2023-08-31