From 1edc82f9cd32ad89a70217e04d6e9d7d2fd8a328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sun, 20 Mar 2022 12:23:50 +0100 Subject: [PATCH] macOS: Try to run unit tests --- .github/workflows/macos-build.yml | 17 ++++------------- xmake.lua | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index f4443886a..e7e46b4f0 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -29,11 +29,6 @@ jobs: steps: - uses: actions/checkout@v2 - # Install system dependencies - - name: Install system dependencies - run: | - brew install libx11 - # Force xmake to a specific folder (for cache) - name: Set xmake env run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV @@ -67,20 +62,16 @@ jobs: # Build the engine - name: Build Nazara run: | - xmake build -v NazaraRenderer - xmake build -v NazaraPhysics2D xmake build -v NazaraPhysics3D - xmake build -v NazaraGraphics xmake build -v NazaraWidgets - xmake build -v NazaraAudio - xmake build -v NazaraNetwork xmake build -v NazaraShaderNodes xmake build -v PluginAssimp + xmake build -v NazaraUnitTests # Run unit tests - #- name: Run unit tests - # if: matrix.mode != 'releasedbg' - # run: xmake run NazaraUnitTests + - name: Run unit tests + if: matrix.mode != 'releasedbg' + run: xmake run NazaraUnitTests # Install the result files # - name: Install Nazara diff --git a/xmake.lua b/xmake.lua index aacf24ded..6a334a732 100644 --- a/xmake.lua +++ b/xmake.lua @@ -72,7 +72,7 @@ local modules = { add_defines("SDL_VIDEO_DRIVER_WAYLAND=1") elseif is_plat("macosx") then add_defines("SDL_VIDEO_DRIVER_COCOA=1") - add_packages("libx11") + add_packages("libx11", { links = {} }) -- we only need X11 headers end end },