diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8880ffd2131501a4cdb1717dbdf4e29b3833305d..7935ddd30bcff35e2f6537af7cb3990b9ec222e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,5 +37,6 @@ build_wine-tibbo: - rm -f /var/www/html/dev/vagrant/spwine-tibbo.box || true - vagrant package --out /var/www/html/dev/vagrant/spwine-tibbo.box - mv -f /var/www/html/dev/vagrant/spwine-tibbo.box /var/www/html/dev/vagrant/wine-tibbo.box + - if [ ! -f "OK" ]; then exit 1; fi after_script: - vagrant destroy -f diff --git a/Vagrantfile b/Vagrantfile index c7e19835794cb9298fa69b944f0aa8eeeab7ca9b..eeefca667e09368d6e7710bf778a14fbb56ce5aa 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -18,6 +18,5 @@ Vagrant.configure("2") do |config| mkdir /etc/udev/rules.d/70-persistent-net.rules || true rm -rf /dev/.udev/ || true rm /lib/udev/rules.d/75-persistent-net-generator.rules || true - SHELL end diff --git a/build.sh b/build.sh index b6779dd3f9ebb7e23c4e2c4f4a3303ab792a2c66..1a5e66021e56ab5bbff3916c60c784d040869287 100644 --- a/build.sh +++ b/build.sh @@ -11,7 +11,7 @@ apt-get install -y python-software-properties # Repositories ## Mono apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -echo "deb http://download.mono-project.com/repo/ubuntu precise main contrib non-free" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list +echo "deb http://download.mono-project.com/repo/ubuntu precise main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list ## WineHQ # wget https://dl.winehq.org/wine-builds/Release.key # apt-key add Release.key @@ -22,7 +22,7 @@ apt-get update # Install things TO_INSTALL="" ## Mono for .NET 4.0, and winbind for ntlm_auth -TO_INSTALL="$TO_INSTALL mono-complete winbind ca-certificates-mono" +TO_INSTALL="$TO_INSTALL mono-complete winbind" ## WINE TO_INSTALL="$TO_INSTALL wine winetricks xvfb" ## Things diff --git a/build_as_vagrant.sh b/build_as_vagrant.sh index 5013fb6aef51d013b379f73c2b3451035958cb73..4b80a26192f89418a8ec837c012a9e3649f1712e 100644 --- a/build_as_vagrant.sh +++ b/build_as_vagrant.sh @@ -27,3 +27,4 @@ winetricks dotnet40 corefonts & sleep 600 kill -9 %2 || true kill -9 %1 +touch /vagrant/OK \ No newline at end of file