Skip to content
Snippets Groups Projects
Commit fa1d504e authored by Piotr Maślanka's avatar Piotr Maślanka
Browse files

okej ojes

parent 52e28896
No related branches found
No related tags found
No related merge requests found
Pipeline #1294 failed with stages
in 12 minutes and 49 seconds
...@@ -37,5 +37,6 @@ build_wine-tibbo: ...@@ -37,5 +37,6 @@ build_wine-tibbo:
- rm -f /var/www/html/dev/vagrant/spwine-tibbo.box || true - rm -f /var/www/html/dev/vagrant/spwine-tibbo.box || true
- vagrant package --out /var/www/html/dev/vagrant/spwine-tibbo.box - 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 - 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: after_script:
- vagrant destroy -f - vagrant destroy -f
...@@ -18,6 +18,5 @@ Vagrant.configure("2") do |config| ...@@ -18,6 +18,5 @@ Vagrant.configure("2") do |config|
mkdir /etc/udev/rules.d/70-persistent-net.rules || true mkdir /etc/udev/rules.d/70-persistent-net.rules || true
rm -rf /dev/.udev/ || true rm -rf /dev/.udev/ || true
rm /lib/udev/rules.d/75-persistent-net-generator.rules || true rm /lib/udev/rules.d/75-persistent-net-generator.rules || true
SHELL SHELL
end end
...@@ -11,7 +11,7 @@ apt-get install -y python-software-properties ...@@ -11,7 +11,7 @@ apt-get install -y python-software-properties
# Repositories # Repositories
## Mono ## Mono
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF 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 ## WineHQ
# wget https://dl.winehq.org/wine-builds/Release.key # wget https://dl.winehq.org/wine-builds/Release.key
# apt-key add Release.key # apt-key add Release.key
...@@ -22,7 +22,7 @@ apt-get update ...@@ -22,7 +22,7 @@ apt-get update
# Install things # Install things
TO_INSTALL="" TO_INSTALL=""
## Mono for .NET 4.0, and winbind for ntlm_auth ## 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 ## WINE
TO_INSTALL="$TO_INSTALL wine winetricks xvfb" TO_INSTALL="$TO_INSTALL wine winetricks xvfb"
## Things ## Things
......
...@@ -27,3 +27,4 @@ winetricks dotnet40 corefonts & ...@@ -27,3 +27,4 @@ winetricks dotnet40 corefonts &
sleep 600 sleep 600
kill -9 %2 || true kill -9 %2 || true
kill -9 %1 kill -9 %1
touch /vagrant/OK
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment