Cross compile to arm for macos (#6)

* Add arm cross compile toolchain file

* Fix

* Test new cross compile

* Add verify command

* version

* Try another thing cmake

* Try fix?

* Fix protocol issues

* Fix

* Build arm64

* Disable fail fast on test workflow

* Remove old downloads

* Update changelog

Author: JohnnyMorganz

.github/workflows/ci.yml

@@ -12,6 +12,7 @@ on:
 jobs:
   build:
     strategy:
+      fail-fast: false
       matrix:
         os: [windows, ubuntu, macos]
     name: Build Server (${{matrix.os}})

.github/workflows/release.yml

@@ -16,8 +16,10 @@ jobs:
             code-target: linux-x64
           - os: macos-latest
             code-target: darwin-x64
+          - os: macos-latest
+            code-target: darwin-arm64 # TODO: we should try and merge this with above, because it runs the exact same steps
 
-    name: ${{ matrix.os }}
+    name: ${{ matrix.os }} - ${{ matrix.code-target }}
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -36,6 +38,10 @@ jobs:
           cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
           cmake --build . --config Release --target luau-lsp
 
+      - name: (MacOS) Verify universal build
+        if: matrix.os == 'macos-latest'
+        run: lipo -archs build/luau-lsp
+
       - name: Move Build + Copy into Extension
         if: matrix.os == 'windows-latest'
         shell: bash
@@ -102,6 +108,10 @@ jobs:
         with:
           name: dist-win32-x64
           path: dist
+      - uses: actions/download-artifact@v1
+        with:
+          name: dist-darwin-arm64
+          path: dist
       - run: ls -al ./dist
 
       - name: Publish Release

CHANGELOG.md

@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added support for pull-based diagnostics
 - Added the base support for user configuration through extension settings
 - Added support for marking specific globs as ignored (through extension settings). If a file is ignored, diagnostics will ONLY be displayed when the file is explicitly opened. If the file is closed, diagnostics will be discarded.
+- Cross compiled macOS binary to arm64
 
 ### Changed
 

CMakeLists.txt

@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.19)
+set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "")
 project(luau-lsp LANGUAGES CXX)
 
 include(CTest)

src/Protocol.hpp

@@ -320,14 +320,14 @@ struct Position
     size_t line;
     size_t character;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Position, line, character);
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Position, line, character);
 
 struct Range
 {
     Position start;
     Position end;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Range, start, end);
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Range, start, end);
 
 struct TextDocumentItem
 {
@@ -336,26 +336,26 @@ struct TextDocumentItem
     int version;
     std::string text;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(TextDocumentItem, uri, languageId, version, text);
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(TextDocumentItem, uri, languageId, version, text);
 
 struct TextDocumentIdentifier
 {
     DocumentUri uri;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(TextDocumentIdentifier, uri);
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(TextDocumentIdentifier, uri);
 
 struct VersionedTextDocumentIdentifier : TextDocumentIdentifier
 {
     int version;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(VersionedTextDocumentIdentifier, uri, version);
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(VersionedTextDocumentIdentifier, uri, version);
 
 struct TextDocumentPositionParams
 {
     TextDocumentIdentifier textDocument;
     Position position;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(TextDocumentPositionParams, textDocument, position);
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(TextDocumentPositionParams, textDocument, position);
 
 struct TextEdit
 {
@@ -388,7 +388,7 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(DidOpenTextDocumentParams, textD
 struct TextDocumentContentChangeEvent
 {
     // If only text is provided, then its considered to be the whole document
-    std::optional<Range> range;
+    std::optional<Range> range = std::nullopt;
     std::string text;
 };
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(TextDocumentContentChangeEvent, range, text);
@@ -398,7 +398,7 @@ struct DidChangeTextDocumentParams
     VersionedTextDocumentIdentifier textDocument;
     std::vector<TextDocumentContentChangeEvent> contentChanges;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(DidChangeTextDocumentParams, textDocument, contentChanges);
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(DidChangeTextDocumentParams, textDocument, contentChanges);
 
 struct DidCloseTextDocumentParams
 {