From 794d052d6f5ee5aaa17c6bfa24a2c2b7be0ca96a Mon Sep 17 00:00:00 2001 From: Daniel Gavin Date: Wed, 27 Jul 2022 16:00:37 +0200 Subject: ci --- .github/workflows/ci.yml | 1 - build.bat | 11 ++++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 049fb18..1f0bfa5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,6 @@ jobs: - name: Build ols shell: cmd run: | - dir ./build.bat CI build_linux: runs-on: ubuntu-latest diff --git a/build.bat b/build.bat index 0ddd3d5..177a20f 100644 --- a/build.bat +++ b/build.bat @@ -1,16 +1,21 @@ -@echo off +@echo on if "%1" == "CI" ( + set "PATH=%cd%\Odin;%PATH%" rem "Odin/odin.exe" test tests -collection:shared=src -debug rem if %errorlevel% neq 0 exit 1 - "Odin/odin.exe" build src\ -show-timings -collection:shared=src -out:ols.exe -o:speed -thread-count:1 + + odin build src\ -show-timings -collection:shared=src -out:ols.exe -o:speed + + call "tools/odinfmt/tests.bat" + if %errorlevel% neq 0 exit 1 ) else if "%1" == "test" ( odin test tests -collection:shared=src -debug ) else if "%1" == "single_test" ( odin test tests -collection:shared=src -test-name:%2 ) else if "%1" == "debug" ( - odin build src\ -show-timings -collection:shared=src -out:ols.exe -o:speed -no-bounds-check -debug + odin build src\ -show-timings -collection:shared=src -microarch:native -out:ols.exe -o:minimal -no-bounds-check -debug ) else ( odin build src\ -show-timings -microarch:native -collection:shared=src -out:ols.exe -o:speed -no-bounds-check ) \ No newline at end of file -- cgit v1.2.3