From 4ee9c47ddcd5be6181a28d93e83e60de999e3fe1 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 7 Jun 2020 21:05:16 -0400 Subject: [PATCH] Looks like meson now requires a newer ninja than what ships with whatever 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). --- azure-pipelines.yml | 36 +++++++++---------- azure-pipelines/TODOMatrix | 36 +++++++++---------- azure-pipelines/collapsed | 6 ++-- .../install-latest-meson-ninja.yml | 9 +++++ azure-pipelines/install-latest-meson.yml | 7 ---- ...inja.yml => linux-386-install-gtk-dev.yml} | 4 +-- .../linux-install-gtk-dev-ninja.yml | 6 ---- azure-pipelines/linux-install-gtk-dev.yml | 6 ++++ 8 files changed, 56 insertions(+), 54 deletions(-) create mode 100644 azure-pipelines/install-latest-meson-ninja.yml delete mode 100644 azure-pipelines/install-latest-meson.yml rename azure-pipelines/{linux-386-install-gtk-dev-ninja.yml => linux-386-install-gtk-dev.yml} (90%) delete mode 100644 azure-pipelines/linux-install-gtk-dev-ninja.yml create mode 100644 azure-pipelines/linux-install-gtk-dev.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d7d3d4c9..a7eb474f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/azure-pipelines/TODOMatrix b/azure-pipelines/TODOMatrix index dab8b98b..516eb4e9 100644 --- a/azure-pipelines/TODOMatrix +++ b/azure-pipelines/TODOMatrix @@ -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' @@ -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: @@ -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 @@ -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 @@ -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 @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/azure-pipelines/collapsed b/azure-pipelines/collapsed index fde0a40d..20e59dc1 100644 --- a/azure-pipelines/collapsed +++ b/azure-pipelines/collapsed @@ -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 } diff --git a/azure-pipelines/install-latest-meson-ninja.yml b/azure-pipelines/install-latest-meson-ninja.yml new file mode 100644 index 00000000..d2934bcb --- /dev/null +++ b/azure-pipelines/install-latest-meson-ninja.yml @@ -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' diff --git a/azure-pipelines/install-latest-meson.yml b/azure-pipelines/install-latest-meson.yml deleted file mode 100644 index 4c86a01e..00000000 --- a/azure-pipelines/install-latest-meson.yml +++ /dev/null @@ -1,7 +0,0 @@ -# 4 april 2019 - -steps: -- script: | - python -m pip install --upgrade pip setuptools wheel - pip install meson - displayName: 'Install Latest Meson' diff --git a/azure-pipelines/linux-386-install-gtk-dev-ninja.yml b/azure-pipelines/linux-386-install-gtk-dev.yml similarity index 90% rename from azure-pipelines/linux-386-install-gtk-dev-ninja.yml rename to azure-pipelines/linux-386-install-gtk-dev.yml index 4856279a..42bf0509 100644 --- a/azure-pipelines/linux-386-install-gtk-dev-ninja.yml +++ b/azure-pipelines/linux-386-install-gtk-dev.yml @@ -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' diff --git a/azure-pipelines/linux-install-gtk-dev-ninja.yml b/azure-pipelines/linux-install-gtk-dev-ninja.yml deleted file mode 100644 index 959d4c11..00000000 --- a/azure-pipelines/linux-install-gtk-dev-ninja.yml +++ /dev/null @@ -1,6 +0,0 @@ -# 7 april 2019 - -steps: -- script: | - sudo apt-get install libgtk-3-dev ninja-build - displayName: 'Install GTK+ Dev Files and Ninja' diff --git a/azure-pipelines/linux-install-gtk-dev.yml b/azure-pipelines/linux-install-gtk-dev.yml new file mode 100644 index 00000000..b797fb72 --- /dev/null +++ b/azure-pipelines/linux-install-gtk-dev.yml @@ -0,0 +1,6 @@ +# 7 april 2019 + +steps: +- script: | + sudo apt-get install libgtk-3-dev + displayName: 'Install GTK+ Dev Files'