From 4e9c6a96db592759a1fa31e5bc76cb826db1f1c9 Mon Sep 17 00:00:00 2001 From: TitanSnow Date: Sat, 20 May 2017 09:26:56 +0800 Subject: install luacov on windows --- appveyor.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 1d0dc4321..0be1330d0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,4 @@ +version: v2.1.5.{build} os: - Visual Studio 2015 - Visual Studio 2017 @@ -6,6 +7,15 @@ platform: - Win32 - Win64 +install: + - ps: Invoke-Webrequest 'http://luarocks.github.io/luarocks/releases/luarocks-2.4.2-win32.zip' -OutFile luarocks.zip + - ps: Expand-Archive luarocks.zip + - cmd: cd luarocks\luarocks-2.4.2-win32 + - cmd: install.bat + - cmd: cd ..\.. + - ps: Remove-Item luarocks -Recurse -Force + - cmd: luarocks install luacov + build_script: - ps: Invoke-Expression (Get-Content scripts\get.ps1 | Out-String) - cmd: xmake lua versioninfo -- cgit v1.3.1 From 0347d349403531dfd8c6bee67e9b059f48e784e3 Mon Sep 17 00:00:00 2001 From: TitanSnow Date: Sat, 20 May 2017 09:40:01 +0800 Subject: install lua on windows --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 0be1330d0..5c68748fa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,6 +10,7 @@ platform: install: - ps: Invoke-Webrequest 'http://luarocks.github.io/luarocks/releases/luarocks-2.4.2-win32.zip' -OutFile luarocks.zip - ps: Expand-Archive luarocks.zip + - ps: Copy-Item -Recurse luarocks\luarocks-2.4.2-win32\win32\lua5.1 C:\lua - cmd: cd luarocks\luarocks-2.4.2-win32 - cmd: install.bat - cmd: cd ..\.. -- cgit v1.3.1 From b789aa55398d8be36ee54327cbb90fc8f2f59035 Mon Sep 17 00:00:00 2001 From: TitanSnow Date: Sat, 20 May 2017 13:12:31 +0800 Subject: fix luacov installation --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5c68748fa..a996eb142 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,9 +12,10 @@ install: - ps: Expand-Archive luarocks.zip - ps: Copy-Item -Recurse luarocks\luarocks-2.4.2-win32\win32\lua5.1 C:\lua - cmd: cd luarocks\luarocks-2.4.2-win32 - - cmd: install.bat + - cmd: install.bat /Q - cmd: cd ..\.. - ps: Remove-Item luarocks -Recurse -Force + - ps: Remove-Item luarocks.zip - cmd: luarocks install luacov build_script: -- cgit v1.3.1 From 158e830466472e9bb56f471344f6633ce7d6262f Mon Sep 17 00:00:00 2001 From: TitanSnow Date: Sat, 20 May 2017 13:35:52 +0800 Subject: set PATH to luarocks --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index a996eb142..698c330b7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,6 +13,7 @@ install: - ps: Copy-Item -Recurse luarocks\luarocks-2.4.2-win32\win32\lua5.1 C:\lua - cmd: cd luarocks\luarocks-2.4.2-win32 - cmd: install.bat /Q + - cmd: set PATH=%PATH%;C:\Program Files (x86)\LuaRocks - cmd: cd ..\.. - ps: Remove-Item luarocks -Recurse -Force - ps: Remove-Item luarocks.zip -- cgit v1.3.1 From 435bb391e6c434b3f0df4ca8957edf6401ec6fa6 Mon Sep 17 00:00:00 2001 From: TitanSnow Date: Sat, 20 May 2017 14:19:50 +0800 Subject: add tests for windows --- appveyor.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 698c330b7..39969eb76 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,11 +13,12 @@ install: - ps: Copy-Item -Recurse luarocks\luarocks-2.4.2-win32\win32\lua5.1 C:\lua - cmd: cd luarocks\luarocks-2.4.2-win32 - cmd: install.bat /Q - - cmd: set PATH=%PATH%;C:\Program Files (x86)\LuaRocks + - cmd: set PATH=%PATH%;C:\Program Files (x86)\LuaRocks;C:\lua\bin - cmd: cd ..\.. - ps: Remove-Item luarocks -Recurse -Force - ps: Remove-Item luarocks.zip - cmd: luarocks install luacov + - ps: Copy-Item -Recurse C:\lua\share\lua\5.1 $HOME\xmake\lua build_script: - ps: Invoke-Expression (Get-Content scripts\get.ps1 | Out-String) @@ -26,3 +27,11 @@ build_script: - cmd: xmake -P core - cmd: set XMAKE_PROGRAM_DIR=%cd%\xmake - cmd: core\build\xmake lua versioninfo + - ps: Write-Output "require('luacov.runner').init({['statsfile']='$PWD/luacov.stats.out',['reportfile']='$PWD/luacov.report.out'})".replace('\','/') | Out-File tmp + - ps: Write-Output (Get-Content xmake\core\_xmake_main.lua | Out-String) | Out-File tmp -Append + - ps: Move-Item -Force tmp xmake\core\_xmake_main.lua + - ps: Copy-Item -Force core\build\xmake.exe $HOME\xmake + - cmd: xmake lua tests\test.lua + +on_success: + - cmd: luacov -- cgit v1.3.1 From 9d7fb55705906dd6965101e5a4f4f77e9d288f5c Mon Sep 17 00:00:00 2001 From: TitanSnow Date: Sat, 20 May 2017 15:11:36 +0800 Subject: use dos2unix to fix newline problem on _xmake_main.lua --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 39969eb76..89c0e1fd6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,6 +29,10 @@ build_script: - cmd: core\build\xmake lua versioninfo - ps: Write-Output "require('luacov.runner').init({['statsfile']='$PWD/luacov.stats.out',['reportfile']='$PWD/luacov.report.out'})".replace('\','/') | Out-File tmp - ps: Write-Output (Get-Content xmake\core\_xmake_main.lua | Out-String) | Out-File tmp -Append + - ps: Invoke-Webrequest 'https://svwh.dl.sourceforge.net/project/dos2unix/dos2unix/7.3.4/dos2unix-7.3.4-win32.zip' -OutFile dos2unix.zip + - ps: Expand-Archive dos2unix.zip + - cmd: dos2unix\bin\dos2unix tmp + - ps: Remove-Item -Recurse dos2unix,dos2unix.zip - ps: Move-Item -Force tmp xmake\core\_xmake_main.lua - ps: Copy-Item -Force core\build\xmake.exe $HOME\xmake - cmd: xmake lua tests\test.lua -- cgit v1.3.1 From 8c5200b4ebdbca7c3ee18ec76d5e1c49a1fc115f Mon Sep 17 00:00:00 2001 From: TitanSnow Date: Sat, 20 May 2017 15:53:25 +0800 Subject: add codecov --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 89c0e1fd6..b2c7bf206 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,3 +39,4 @@ build_script: on_success: - cmd: luacov + - ps: Write-Output (Invoke-Webrequest https://codecov.io/bash -UseBasicParsing).Content | C:\cygwin\bin\bash -- cgit v1.3.1 From 3a6fa73f62fe1c3825e7ff93e55c75807fa6f569 Mon Sep 17 00:00:00 2001 From: TitanSnow Date: Sat, 20 May 2017 17:23:16 +0800 Subject: use py version of codecov --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b2c7bf206..aeda4a204 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,5 +38,6 @@ build_script: - cmd: xmake lua tests\test.lua on_success: - - cmd: luacov - - ps: Write-Output (Invoke-Webrequest https://codecov.io/bash -UseBasicParsing).Content | C:\cygwin\bin\bash + - luacov + - pip install codecov + - codecov -- cgit v1.3.1 From ecb541eb380228f94f826aa5775c016383f34a94 Mon Sep 17 00:00:00 2001 From: TitanSnow Date: Sat, 20 May 2017 17:28:12 +0800 Subject: specify report file's name --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index aeda4a204..ac80a3b6a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,4 +40,4 @@ build_script: on_success: - luacov - pip install codecov - - codecov + - codecov --file luacov.report.out -- cgit v1.3.1 From 4456dbd2f7b2f96812ed00d67cf484178375931c Mon Sep 17 00:00:00 2001 From: TitanSnow Date: Sat, 20 May 2017 17:51:48 +0800 Subject: add vs2013 --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index ac80a3b6a..89cf9b7f7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,6 @@ version: v2.1.5.{build} os: + - Visual Studio 2013 - Visual Studio 2015 - Visual Studio 2017 -- cgit v1.3.1