Skip to content

Commit

Permalink
Looks like meson now requires a newer ninja than what ships with what…
Browse files Browse the repository at this point in the history
…ever version of whatever Debian-derived distribution Azure Pipelines uses. Use ninja from pip instead (it's a special distribution maintained by the SciPy guys, apparently).
  • Loading branch information
andlabs committed Jun 8, 2020
1 parent a0a9807 commit 4ee9c47
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 54 deletions.
36 changes: 18 additions & 18 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
clean: all
steps:
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/linux-386-install-gtk-dev.yml
- template: azure-pipelines/configure.yml
parameters:
beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
Expand All @@ -46,8 +46,8 @@ jobs:
clean: all
steps:
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/linux-386-install-gtk-dev.yml
- template: azure-pipelines/configure.yml
parameters:
beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
Expand All @@ -69,8 +69,8 @@ jobs:
clean: all
steps:
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/linux-install-gtk-dev-ninja.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/linux-install-gtk-dev.yml
- template: azure-pipelines/configure.yml
parameters:
defaultLibrary: shared
Expand All @@ -91,8 +91,8 @@ jobs:
clean: all
steps:
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/linux-install-gtk-dev-ninja.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/linux-install-gtk-dev.yml
- template: azure-pipelines/configure.yml
parameters:
defaultLibrary: static
Expand All @@ -117,7 +117,7 @@ jobs:
clean: all
steps:
- template: azure-pipelines/vs2015-install-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml
parameters:
Expand All @@ -143,7 +143,7 @@ jobs:
clean: all
steps:
- template: azure-pipelines/vs2015-install-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml
parameters:
Expand All @@ -170,7 +170,7 @@ jobs:
clean: all
steps:
- template: azure-pipelines/vs2015-install-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml
parameters:
Expand All @@ -196,7 +196,7 @@ jobs:
clean: all
steps:
- template: azure-pipelines/vs2015-install-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml
parameters:
Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
clean: all
steps:
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml
parameters:
Expand All @@ -253,7 +253,7 @@ jobs:
clean: all
steps:
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml
parameters:
Expand All @@ -280,7 +280,7 @@ jobs:
clean: all
steps:
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml
parameters:
Expand All @@ -306,7 +306,7 @@ jobs:
clean: all
steps:
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/configure.yml
parameters:
Expand Down Expand Up @@ -339,7 +339,7 @@ jobs:
clean: all
steps:
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/darwin-install-ninja.yml
- template: azure-pipelines/configure.yml
parameters:
Expand All @@ -361,7 +361,7 @@ jobs:
clean: all
steps:
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: azure-pipelines/darwin-install-ninja.yml
- template: azure-pipelines/configure.yml
parameters:
Expand Down
36 changes: 18 additions & 18 deletions azure-pipelines/TODOMatrix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ strategy:
libtype: 'shared'
vmImage: 'ubuntu-16.04'
python3Template: 'azure-pipelines/setup-python3.yml'
depsAndNinjaTemplate: 'azure-pipelines/linux-386-install-gtk-dev-ninja.yml'
depsAndNinjaTemplate: 'azure-pipelines/linux-386-install-gtk-dev.yml'
beforeConfigure: 'export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig'
artifactTemplate: 'azure-pipelines/artifacts.yml'
libfiles: 'libui.so.0'
Expand All @@ -39,7 +39,7 @@ workspace:

steps:
- template: $(variables.python3Template)
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
- template: $(variables.depsAndNinjaTemplate)
- template: azure-pipelines/configure.yml
parameters:
Expand Down Expand Up @@ -67,8 +67,8 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/linux-386-install-gtk-dev.yml
# - template: azure-pipelines/configure.yml
# parameters:
# beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
Expand All @@ -90,8 +90,8 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/linux-install-gtk-dev-ninja.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/linux-install-gtk-dev.yml
# - template: azure-pipelines/configure.yml
# parameters:
# defaultLibrary: shared
Expand All @@ -112,8 +112,8 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/linux-install-gtk-dev-ninja.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/linux-install-gtk-dev.yml
# - template: azure-pipelines/configure.yml
# parameters:
# defaultLibrary: static
Expand All @@ -138,7 +138,7 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/vs2015-install-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml
# parameters:
Expand All @@ -164,7 +164,7 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/vs2015-install-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml
# parameters:
Expand All @@ -191,7 +191,7 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/vs2015-install-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml
# parameters:
Expand All @@ -217,7 +217,7 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/vs2015-install-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml
# parameters:
Expand Down Expand Up @@ -248,7 +248,7 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml
# parameters:
Expand All @@ -274,7 +274,7 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml
# parameters:
Expand All @@ -301,7 +301,7 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml
# parameters:
Expand All @@ -327,7 +327,7 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/windows-install-ninja.yml
# - template: azure-pipelines/configure.yml
# parameters:
Expand Down Expand Up @@ -360,7 +360,7 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/darwin-install-ninja.yml
# - template: azure-pipelines/configure.yml
# parameters:
Expand All @@ -382,7 +382,7 @@ steps:
# clean: all
# steps:
# - template: azure-pipelines/setup-python3.yml
# - template: azure-pipelines/install-latest-meson.yml
# - template: azure-pipelines/install-latest-meson-ninja.yml
# - template: azure-pipelines/darwin-install-ninja.yml
# - template: azure-pipelines/configure.yml
# parameters:
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines/collapsed
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@
- template: azure-pipelines/setup-python3.yml
- template: azure-pipelines/vs2015-install-python3.yml
}
- template: azure-pipelines/install-latest-meson.yml
- template: azure-pipelines/install-latest-meson-ninja.yml
{
- template: azure-pipelines/linux-386-install-gtk-dev-ninja.yml
- template: azure-pipelines/linux-install-gtk-dev-ninja.yml
- template: azure-pipelines/linux-386-install-gtk-dev.yml
- template: azure-pipelines/linux-install-gtk-dev.yml
- template: azure-pipelines/windows-install-ninja.yml
- template: azure-pipelines/darwin-install-ninja.yml
}
Expand Down
9 changes: 9 additions & 0 deletions azure-pipelines/install-latest-meson-ninja.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# 4 april 2019

# TODO remove ninja installation from non-Linux OSs and make the same ninja via pip change in the AppVeyor script

steps:
- script: |
python -m pip install --upgrade pip setuptools wheel
pip install meson ninja
displayName: 'Install Latest Meson and Ninja'
7 changes: 0 additions & 7 deletions azure-pipelines/install-latest-meson.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ steps:
sudo apt-get install --allow-downgrades \
gcc-multilib g++-multilib \
$llvmPackages \
libgtk-3-dev:i386 ninja-build
displayName: 'Install GTK+ Dev Files and Ninja'
libgtk-3-dev:i386
displayName: 'Install GTK+ Dev Files'
6 changes: 0 additions & 6 deletions azure-pipelines/linux-install-gtk-dev-ninja.yml

This file was deleted.

6 changes: 6 additions & 0 deletions azure-pipelines/linux-install-gtk-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# 7 april 2019

steps:
- script: |
sudo apt-get install libgtk-3-dev
displayName: 'Install GTK+ Dev Files'

0 comments on commit 4ee9c47

Please # to comment.