dootneet

.gitlab-ci.yml

@@ -38,10 +38,7 @@ build_wine-tibbo:
     - vagrant
     - develop19216822423
   before_script:
-    - cp *.sh wine-tibbo/
-    - cp SkeletonVagrantfile wine-tibbo/Vagrantfile
     - cd wine-tibbo
-    - python ../make.py meta
   script:
     - cd $CI_PROJECT_DIR
     - cd wine-tibbo

SkeletonVagrantfile

 
 Vagrant.configure("2") do |config|
-  config.vm.box = "debian/contrib-jessie64"
+  config.vm.box = "debian/contrib-jessie32"
 
   config.vm.provider "virtualbox" do |v|
     v.memory = 1260

wine-tibbo/Vagrantfile

+
+Vagrant.configure("2") do |config|
+  config.vm.box = "debian/contrib-jessie32"
+
+  config.vm.provider "virtualbox" do |v|
+    v.memory = 1260
+    v.cpus = 3
+    config.vm.synced_folder "/var/www/html/dev/misc", "/wynurz-utils", :mount_options => ["ro"]
+  end
+
+  config.vm.provision "shell", inline: <<-SHELL
+    apt-get update
+    apt-get install -y curl
+
+    bash build.sh
+    su vagrant -c 'bash /vagrant/build_as_vagrant.sh'
+
+    # Minify
+    apt-get clean
+    rm -f /usr/bin/wynurz
+    dd if=/dev/zero of=/EMPTY bs=1M
+    rm -f /EMPTY
+    rm -rf /tmp/*
+    # udev rules
+    rm /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 /lib/udev/rules.d/75-persistent-net-generator.rules || true
+
+  SHELL
+end

wine-tibbo/build.sh

@@ -11,9 +11,8 @@ apt-get install -y mono-complete winbind        # winbind - ntlm_auth for .NET
 
 # Install WINE
 echo "deb http://httpredir.debian.org/debian jessie-backports main contrib non-free" >> /etc/apt/sources.list
-dpkg --add-architecture i386
 apt-get update
-apt-get install -y wget xvfb wine/jessie-backports unzip wine32/jessie-backports libwine:i386/jessie-backports wine64/jessie-backports libwine/jessie-backports fonts-wine/jessie-backports winetricks
+apt-get install -y wget xvfb wine/jessie-backports unzip wine32/jessie-backports libwine/jessie-backports wine64/jessie-backports libwine/jessie-backports fonts-wine/jessie-backports winetricks
 
 # Install command
 cp -f /vagrant/tibbo_build.sh /usr/sbin/tibbo_build

wine-tibbo/build_as_vagrant.sh

@@ -3,7 +3,6 @@ set -e
 set -x
 
 export DISPLAY=:0.0
-export WINEARCH="win32"
 export WINEPREFIX="/home/vagrant/.wine"
 
 cd /home/vagrant