From 5452f8258fff0c7e24c4df4c8c62d18416a7be66 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 7 Apr 2019 02:12:35 -0400 Subject: [PATCH] Let's try a Linux 386 build next! NumPy uses Docker; let's see if the Travis CI thing we did works here too instead. --- azure-pipelines.yml | 51 +++++++++++++++++++++++++++++++------------ azure-pipelines_linux | 3 +++ 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 87fcc79d..34494121 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,31 +4,54 @@ variables: releaseExamples: 'controlgallery cpp-multithread datetime drawtext histogram tester timer' jobs: -- job: darwin_amd64_1014sdk_shared - displayName: 'Darwin amd64 10.14 SDK Shared' +- job: linux_386_shared + displayName: 'Linux 386 Shared' pool: - vmImage: 'macos-10.13' + vmImage: 'ubuntu-16.04' workspace: clean: all steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - template: azure-pipelines/darwin-install-ninja.yml - script: | - xcodebuild -showsdks - exit 1 - displayName: "Help" + # the ones after ninja-build fix broken dependencies of libgtk-3-0:i386 + sudo apt-get install gcc-multilib g++-multilib 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/configure.yml parameters: - beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) + beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig defaultLibrary: shared - template: azure-pipelines/build.yml - parameters: - beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path) - template: azure-pipelines/darwinunix-artifacts.yml parameters: - os: darwin - arch: amd64 + os: linux + arch: 386 libtype: shared - libfiles: libui.A.dylib - osHeader: ui_darwin.h + libfiles: libui.so.0 + osHeader: ui_unix.h + +- job: linux_386_static + displayName: 'Linux 386 Static' + pool: + vmImage: 'ubuntu-16.04' + workspace: + clean: all + steps: + - template: azure-pipelines/setup-python3.yml + - template: azure-pipelines/install-latest-meson.yml + - script: | + # the ones after ninja-build fix broken dependencies of libgtk-3-0:i386 + sudo apt-get install gcc-multilib g++-multilib 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/configure.yml + parameters: + beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig + defaultLibrary: static + - template: azure-pipelines/build.yml + - template: azure-pipelines/darwinunix-artifacts.yml + parameters: + os: linux + arch: 386 + libtype: static + libfiles: libui.a + osHeader: ui_unix.h diff --git a/azure-pipelines_linux b/azure-pipelines_linux index adf3ed34..c484d052 100644 --- a/azure-pipelines_linux +++ b/azure-pipelines_linux @@ -54,6 +54,9 @@ jobs: # mac { +# TODO beforeConfigure/beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path)? + + - job: darwin_amd64_shared displayName: 'Darwin amd64 Shared' pool: