Commit 53f24acf authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Fixed travis build

Bumped KeraLua/KopiLua
parent 081b78c7
...@@ -3,16 +3,19 @@ ...@@ -3,16 +3,19 @@
# #
# Travis language: c(sharp) :-P # Travis language: c(sharp) :-P
language: c language: csharp
# We need CMake, Mono and NUnit before_install:
install: - date -u
- sudo apt-get install cmake mono-devel nunit >/dev/null 2>&1 - uname -a
- export PATH=/opt/mono/bin:$PATH
- env | sort
install: ./CI/travis.${TRAVIS_OS_NAME}.install.deps.sh
script: script:
- uname --all - git submodule update --init
- git submodule update --init --recursive - ./run_all.linux64.sh
- ./run_all.linux.sh
# Execute additional tests or commands # Execute additional tests or commands
#after_script: #after_script:
...@@ -29,4 +32,4 @@ notifications: ...@@ -29,4 +32,4 @@ notifications:
- viniciusjarina@gmail.com - viniciusjarina@gmail.com
email: email:
on_success: change on_success: change
on_failure: always on_failure: always
\ No newline at end of file
set -ev
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
echo "deb http://download.mono-project.com/repo/debian wheezy/snapshots/3.12.0 main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list
sudo apt-get update
sudo apt-get install mono-devel cmake nunit
\ No newline at end of file
Subproject commit 37c0b9fb6b0df3e9d651dd34463d82f6cfba6556 Subproject commit e5ef8341688d8a25e8cf6f6d812ab3da365399b6
Subproject commit f0e9ed80f557a472440486683b92cde983fe1ced Subproject commit 2f0dfdcc50acca3e88afa6ef5cc5ad97f142e57a
...@@ -126,6 +126,9 @@ ...@@ -126,6 +126,9 @@
<Link>Resources\test_32.luac</Link> <Link>Resources\test_32.luac</Link>
</BundleResource> </BundleResource>
<None Include="Info.plist" /> <None Include="Info.plist" />
<BundleResource Include="..\..\tests\test_64.luac">
<Link>Resources\test_64.luac</Link>
</BundleResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Main.cs" /> <Compile Include="Main.cs" />
......
#!/bin/sh #!/bin/sh
# If you have mono x86 installed on a amd64 linux. # If you have mono x86 installed on a amd64 linux.
#export CFLAGS=-m32 export CFLAGS=-m64
#export CXXFLAGS=-m32 export CXXFLAGS=-m64
#export LDFLAGS=-m32 export LDFLAGS=-m64
#export LD_LIBRARY_PATH=$PWD/external/lua/linux/lib64 #export LD_LIBRARY_PATH=$PWD/external/lua/linux/lib64
cd Core/KeraLua/ cd Core/KeraLua/
make -f Makefile.Linux make -f Makefile.Linux
xbuild KeraLua.Net40.sln /p:Configuration=Release xbuild KeraLua.Net45.sln /p:Configuration=Release
cd ../../ cd ../../
xbuild NLua.Net40.sln /p:Configuration=Release xbuild NLua.Net45.sln /p:Configuration=Release
export LD_LIBRARY_PATH=$PWD/Core/KeraLua/external/lua/linux/lib64 export LD_LIBRARY_PATH=$PWD/Core/KeraLua/external/lua/linux/lib64
cd tests/ cd tests/
nunit-console NLuaTest.dll nunit-console NLuaTest.dll
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment