All right, now split all those steps into its own file, clean up all the debugging nonsense, and apply it to the static build as well. Let's hope the artifacts are useful!

This commit is contained in:
Pietro Gagliardi 2019-04-07 13:45:02 -04:00
parent dffdb63f01
commit 85544275d0
2 changed files with 18 additions and 23 deletions

View File

@ -13,21 +13,7 @@ jobs:
steps:
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- script: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install gcc-multilib g++-multilib || echo 1 # libc6-i386 libc6-dev-i386 lib32stdc++6 lib32tinfo5 lib32tinfo-dev lib32z1 lib32z1-dev
# Azure Pipelines ships with a patched version of this and that patch is only available on 64-bit systems, so trying to install the 32-bit versions will remove the 64-bit versions outright
# This is a dependency of Mesa, so we'll have to downgrade to the stock distro ones :/
llvmPackages=
for i in libllvm6.0 clang-6.0 libclang-common-6.0-dev liblldb-6.0 liblldb-6.0-dev lld-6.0 lldb-6.0 llvm-6.0-dev python-lldb-6.0 libclang1-6.0 llvm-6.0 llvm-6.0-runtime; do llvmPackages="$llvmPackages $i=1:6.0-1ubuntu2~16.04.1"; done
sudo apt-get install --allow-downgrades $llvmPackages
#for i in libllvm6.0:i386 libgl1-mea-dri:i386 libegl1-mesa:i386 libwayland-egl1-mesa:i386 libgtk-3-0:i386 libwayland-egl1:i386; do sudo apt-cache show $i ; echo ; echo '----------------' ; echo ; done
#sudo apt-cache policy libllvm6-0:i386
#sudo apt-get install libllvm6-0:i386
# the ones after ninja-build fix broken dependencies of libgtk-3-0:i386
sudo apt-get install libgtk-3-0:i386 libgtk-3-dev:i386 ninja-build # libgirepository-1.0-1:i386 libglib2.0-dev:i386 gir1.2-glib-2.0:i386 gir1.2-atk-1.0:i386 libatk1.0-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcairo2-dev:i386 libgdk-pixbuf2.0-dev:i386 libpango1.0-dev:i386 libxft-dev:i386 libpng12-dev:i386
displayName: 'Install Dependencies'
- template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml
- template: azure-pipelines/configure.yml
parameters:
beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
@ -48,16 +34,9 @@ jobs:
workspace:
clean: all
steps:
- script: exit 1
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- script: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install gcc-multilib g++-multilib
# the ones after ninja-build fix broken dependencies of libgtk-3-0:i386
sudo apt-get install libc6:i386 libc6-dev:i386 libgtk-3-0:i386 libgtk-3-dev:i386 ninja-build # libgirepository-1.0-1:i386 libglib2.0-dev:i386 gir1.2-glib-2.0:i386 gir1.2-atk-1.0:i386 libatk1.0-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcairo2-dev:i386 libgdk-pixbuf2.0-dev:i386 libpango1.0-dev:i386 libxft-dev:i386 libpng12-dev:i386
displayName: 'Install Dependencies'
- template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml
- template: azure-pipelines/configure.yml
parameters:
beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig

View File

@ -0,0 +1,16 @@
# 7 april 2019
# TODO figure out how to get meson to recognize the compiler is producing 32-bit output
steps:
- script: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install gcc-multilib g++-multilib || echo 1 # libc6-i386 libc6-dev-i386 lib32stdc++6 lib32tinfo5 lib32tinfo-dev lib32z1 lib32z1-dev
# Azure Pipelines ships with a patched version of this and that patch is only available on 64-bit systems, so trying to install the 32-bit versions will remove the 64-bit versions outright
# This is a dependency of Mesa, so we'll have to downgrade to the stock distro ones :/
llvmPackages=
for i in libllvm6.0 clang-6.0 libclang-common-6.0-dev liblldb-6.0 liblldb-6.0-dev lld-6.0 lldb-6.0 llvm-6.0-dev python-lldb-6.0 libclang1-6.0 llvm-6.0 llvm-6.0-runtime; do llvmPackages="$llvmPackages $i=1:6.0-1ubuntu2~16.04.1"; done
sudo apt-get install --allow-downgrades $llvmPackages
sudo apt-get install libgtk-3-dev:i386 ninja-build
displayName: 'Install GTK+ Dev Files and Ninja'