From c4c1fae3fc3360bb79de47d4a35fb8ec35a891b1 Mon Sep 17 00:00:00 2001 From: Fancy2209 <64917206+Fancy2209@users.noreply.github.com> Date: Wed, 11 Feb 2026 13:44:36 -0100 Subject: [PATCH 1/6] Compile for Intel macs on Actions --- .github/workflows/Mona.yml | 122 +++++++++++++++++++++++++++++++++++-- 1 file changed, 116 insertions(+), 6 deletions(-) diff --git a/.github/workflows/Mona.yml b/.github/workflows/Mona.yml index 5505f94..828efc8 100644 --- a/.github/workflows/Mona.yml +++ b/.github/workflows/Mona.yml @@ -5,7 +5,6 @@ on: branches: [ "master" ] pull_request: branches: [ "master" ] - workflow_dispatch: jobs: @@ -22,10 +21,9 @@ jobs: run: | make -j$(sysctl -n hw.physicalcpu) mkdir -p MonaBin/MonaServer - mkdir -p MonaBin/MonaBase/lib - mkdir -p MonaBin/MonaCore/lib - cp MonaBase/lib/*.dylib MonaBin/MonaBase/lib - cp MonaCore/lib/*.dylib MonaBin/MonaCore/lib + mkdir -p MonaBin/lib + cp MonaBase/lib/*.dylib MonaBin/lib + cp MonaCore/lib/*.dylib MonaBin/lib cp -r MonaServer/www MonaServer/*.pem MonaServer/MonaServer MonaTiny/MonaTiny MonaServer/MonaServer.ini MonaBin/MonaServer - name: Upload Artifact @@ -33,8 +31,120 @@ jobs: with: name: MonaServer-macOS-arm path: MonaBin + + build-macOS-x64: + runs-on: macos-15 + + steps: + - uses: actions/checkout@master + + - name: Install Deps + shell: arch -x86_64 bash -e {0} + run: | + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + echo >> /Users/runner/.bash_profile + echo 'eval "$(/usr/local/bin/brew shellenv bash)"' >> /Users/runner/.bash_profile + eval "$(/usr/local/bin/brew shellenv bash)" + brew install luajit --HEAD && brew install openssl + + - name: Build + shell: arch -x86_64 bash -e {0} + run: | + eval "$(/usr/local/bin/brew shellenv bash)" + CXX="arch -x86_64 g++" make -j$(sysctl -n hw.physicalcpu) + mkdir -p MonaBin/MonaServer + mkdir -p MonaBin/lib + cp MonaBase/lib/*.dylib MonaBin/lib + cp MonaCore/lib/*.dylib MonaBin/lib + cp -r MonaServer/www MonaServer/*.pem MonaServer/MonaServer MonaTiny/MonaTiny MonaServer/MonaServer.ini MonaBin/MonaServer - # TODO: Unit Tests don't work on mac for some reason + - name: Upload Artifact + uses: actions/upload-artifact@v4 + with: + name: MonaServer-macOS-x64 + path: MonaBin + + - name: Unit Tests + shell: arch -x86_64 bash -e {0} + run: | + mkdir -p ../lib + cp ../MonaBase/lib/libMonaBase.dylib ../MonaCore/lib/libMonaCore.dylib ../lib + codesign --force --sign - ../lib/libMonaBase.dylib + codesign --force --sign - ../lib/libMonaCore.dylib + codesign --force --sign - UnitTests + ./UnitTests -m=all + cat UnitTests.log/0.log + working-directory: UnitTests/ + + build-windows: + runs-on: windows-latest + + steps: + - uses: actions/checkout@master + + - name: Setup VSC + uses: TheMrMilchmann/setup-msvc-dev@v3 + with: + arch: x64 + + - name: Build + run: | + msbuild Mona.sln + mkdir MonaBin + cp -r MonaServer/www MonaBin/ + cp MonaServer/*.pem MonaBin/ + cp MonaServer/debug/MonaServer.exe MonaBin/ + cp MonaTiny/debug/MonaTiny.exe MonaBin/ + cp MonaServer/MonaServer.ini MonaBin/ + cp MonaServer/External/lib64/lua51.dll MonaBin/ + + - name: Upload Artifact + uses: actions/upload-artifact@v4 + with: + name: MonaServer-Win + path: MonaBin + + - name: Unit Tests + run: | + cp debug\* . + .\UnitTests.exe -m=all + cat UnitTests.log/0.log + working-directory: UnitTests/ + + + build-linux: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@master + + - name: Install Deps + run: | + git clone https://github.com/LuaJIT/LuaJIT.git + cd LuaJIT + make -j$(nproc) && sudo make install + + - name: Build + run: | + make -j$(nproc) + mkdir -p MonaBin/MonaServer + mkdir -p MonaBin/MonaBase/lib + mkdir -p MonaBin/MonaCore/lib + cp MonaBase/lib/*.so MonaBin/MonaBase/lib + cp MonaCore/lib/*.so MonaBin/MonaCore/lib + cp -r MonaServer/www MonaServer/*.pem MonaServer/MonaServer MonaTiny/MonaTiny MonaServer/MonaServer.ini MonaBin/MonaServer + + - name: Upload Artifact + uses: actions/upload-artifact@v4 + with: + name: MonaServer-Linux + path: MonaBin + + - name: Unit Tests + run: | + ./UnitTests -m=all + cat UnitTests.log/0.log + working-directory: UnitTests/ # TODO: Unit Tests don't work on mac for some reason #- name: Unit Tests # run: | # ./UnitTests -m=all From e80c663fe823d7cf3b1abb2e87711f7fb3721a2f Mon Sep 17 00:00:00 2001 From: Fancy2209 <64917206+Fancy2209@users.noreply.github.com> Date: Wed, 11 Feb 2026 13:48:42 -0100 Subject: [PATCH 2/6] Fix yml --- .github/workflows/Mona.yml | 77 +------------------------------------- 1 file changed, 1 insertion(+), 76 deletions(-) diff --git a/.github/workflows/Mona.yml b/.github/workflows/Mona.yml index 828efc8..5e8b300 100644 --- a/.github/workflows/Mona.yml +++ b/.github/workflows/Mona.yml @@ -112,82 +112,6 @@ jobs: working-directory: UnitTests/ - build-linux: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@master - - - name: Install Deps - run: | - git clone https://github.com/LuaJIT/LuaJIT.git - cd LuaJIT - make -j$(nproc) && sudo make install - - - name: Build - run: | - make -j$(nproc) - mkdir -p MonaBin/MonaServer - mkdir -p MonaBin/MonaBase/lib - mkdir -p MonaBin/MonaCore/lib - cp MonaBase/lib/*.so MonaBin/MonaBase/lib - cp MonaCore/lib/*.so MonaBin/MonaCore/lib - cp -r MonaServer/www MonaServer/*.pem MonaServer/MonaServer MonaTiny/MonaTiny MonaServer/MonaServer.ini MonaBin/MonaServer - - - name: Upload Artifact - uses: actions/upload-artifact@v4 - with: - name: MonaServer-Linux - path: MonaBin - - - name: Unit Tests - run: | - ./UnitTests -m=all - cat UnitTests.log/0.log - working-directory: UnitTests/ # TODO: Unit Tests don't work on mac for some reason - #- name: Unit Tests - # run: | - # ./UnitTests -m=all - # cat UnitTests.log/0.log - # working-directory: UnitTests/ - - - build-windows: - runs-on: windows-latest - - steps: - - uses: actions/checkout@master - - - name: Setup VSC - uses: TheMrMilchmann/setup-msvc-dev@v3 - with: - arch: x64 - - - name: Build - run: | - msbuild Mona.sln - mkdir MonaBin - cp -r MonaServer/www MonaBin/ - cp MonaServer/*.pem MonaBin/ - cp MonaServer/debug/MonaServer.exe MonaBin/ - cp MonaTiny/debug/MonaTiny.exe MonaBin/ - cp MonaServer/MonaServer.ini MonaBin/ - cp MonaServer/External/lib64/lua51.dll MonaBin/ - - - name: Upload Artifact - uses: actions/upload-artifact@v4 - with: - name: MonaServer-Win - path: MonaBin - - - name: Unit Tests - run: | - cp debug\* . - .\UnitTests.exe -m=all - cat UnitTests.log/0.log - working-directory: UnitTests/ - - build-linux: runs-on: ubuntu-latest @@ -221,3 +145,4 @@ jobs: ./UnitTests -m=all cat UnitTests.log/0.log working-directory: UnitTests/ + From 5b7db98780e885431f1884f83f9d9f2616b8bbf8 Mon Sep 17 00:00:00 2001 From: Fancy2209 <64917206+Fancy2209@users.noreply.github.com> Date: Wed, 11 Feb 2026 14:22:11 -0100 Subject: [PATCH 3/6] Update Mona.yml --- .github/workflows/Mona.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Mona.yml b/.github/workflows/Mona.yml index 5e8b300..1a2b9a0 100644 --- a/.github/workflows/Mona.yml +++ b/.github/workflows/Mona.yml @@ -68,10 +68,10 @@ jobs: shell: arch -x86_64 bash -e {0} run: | mkdir -p ../lib - cp ../MonaBase/lib/libMonaBase.dylib ../MonaCore/lib/libMonaCore.dylib ../lib - codesign --force --sign - ../lib/libMonaBase.dylib - codesign --force --sign - ../lib/libMonaCore.dylib - codesign --force --sign - UnitTests + cp ../MonaBase/lib/libMonaBase.dylib ../MonaCore/lib/libMonaCore.dylib ../lib/ + codesign --force --sign - ../lib/libMonaBase.dylib || true + codesign --force --sign - ../lib/libMonaCore.dylib || true + codesign --force --sign - UnitTests || true ./UnitTests -m=all cat UnitTests.log/0.log working-directory: UnitTests/ From 403cb4dee1f21d5cedc6a5d4e51b01ff64831934 Mon Sep 17 00:00:00 2001 From: Fancy2209 <64917206+Fancy2209@users.noreply.github.com> Date: Wed, 11 Feb 2026 14:58:57 -0100 Subject: [PATCH 4/6] Fix --- .github/workflows/Mona.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Mona.yml b/.github/workflows/Mona.yml index 1a2b9a0..a3bfcad 100644 --- a/.github/workflows/Mona.yml +++ b/.github/workflows/Mona.yml @@ -67,11 +67,11 @@ jobs: - name: Unit Tests shell: arch -x86_64 bash -e {0} run: | - mkdir -p ../lib - cp ../MonaBase/lib/libMonaBase.dylib ../MonaCore/lib/libMonaCore.dylib ../lib/ - codesign --force --sign - ../lib/libMonaBase.dylib || true - codesign --force --sign - ../lib/libMonaCore.dylib || true - codesign --force --sign - UnitTests || true + mkdir ../lib + cp -r ../MonaBin/lib .. + codesign --force --sign - ../lib/libMonaBase.dylib + codesign --force --sign - ../lib/libMonaCore.dylib + codesign --force --sign - UnitTests ./UnitTests -m=all cat UnitTests.log/0.log working-directory: UnitTests/ From f4e11b1c02f5c047695b7d56481fd4fb225ad672 Mon Sep 17 00:00:00 2001 From: Fancy2209 <64917206+Fancy2209@users.noreply.github.com> Date: Wed, 11 Feb 2026 15:21:42 -0100 Subject: [PATCH 5/6] Another attempt at figuring out what is going wrong with UnitTest --- .github/workflows/Mona.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Mona.yml b/.github/workflows/Mona.yml index a3bfcad..271bec9 100644 --- a/.github/workflows/Mona.yml +++ b/.github/workflows/Mona.yml @@ -67,11 +67,10 @@ jobs: - name: Unit Tests shell: arch -x86_64 bash -e {0} run: | - mkdir ../lib cp -r ../MonaBin/lib .. - codesign --force --sign - ../lib/libMonaBase.dylib - codesign --force --sign - ../lib/libMonaCore.dylib - codesign --force --sign - UnitTests + codesign --verbose=4 --force --sign - ../lib/libMonaBase.dylib && xattr -d com.apple.quarantine ../lib/libMonaBase.dylib + codesign --verbose=4 --force --sign - ../lib/libMonaCore.dylib && xattr -d com.apple.quarantine ../lib/libMonaCore.dylib + codesign --verbose=4 --force --sign - UnitTests && xattr -d com.apple.quarantine UnitTests ./UnitTests -m=all cat UnitTests.log/0.log working-directory: UnitTests/ From a08736ef327eb7fde8426a68b3d0bf49194f21f3 Mon Sep 17 00:00:00 2001 From: Fancy2209 <64917206+Fancy2209@users.noreply.github.com> Date: Wed, 11 Feb 2026 15:40:34 -0100 Subject: [PATCH 6/6] Final attempt at UnitTests --- .github/workflows/Mona.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Mona.yml b/.github/workflows/Mona.yml index 271bec9..1063e64 100644 --- a/.github/workflows/Mona.yml +++ b/.github/workflows/Mona.yml @@ -68,9 +68,12 @@ jobs: shell: arch -x86_64 bash -e {0} run: | cp -r ../MonaBin/lib .. - codesign --verbose=4 --force --sign - ../lib/libMonaBase.dylib && xattr -d com.apple.quarantine ../lib/libMonaBase.dylib - codesign --verbose=4 --force --sign - ../lib/libMonaCore.dylib && xattr -d com.apple.quarantine ../lib/libMonaCore.dylib - codesign --verbose=4 --force --sign - UnitTests && xattr -d com.apple.quarantine UnitTests + codesign --verbose=4 --force --sign - ../lib/libMonaBase.dylib + codesign --verbose=4 --force --sign - ../lib/libMonaCore.dylib + codesign --verbose=4 --force --sign - UnitTests + ./UnitTests -m=all || true && xattr -rc . + ./UnitTests -m=all || true && xattr -rc . + ./UnitTests -m=all || true && xattr -rc . ./UnitTests -m=all cat UnitTests.log/0.log working-directory: UnitTests/