diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 86bd91ec..44874fc7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,7 +19,7 @@ jobs: beforeConfigure: export CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig defaultLibrary: shared - template: azure-pipelines/build.yml - - template: azure-pipelines/darwinunix-artifacts.yml + - template: azure-pipelines/artifacts.yml parameters: os: linux arch: 386 @@ -42,7 +42,7 @@ jobs: 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 + - template: azure-pipelines/artifacts.yml parameters: os: linux arch: 386 diff --git a/azure-pipelines/darwinunix-artifacts.yml b/azure-pipelines/artifacts.yml similarity index 100% rename from azure-pipelines/darwinunix-artifacts.yml rename to azure-pipelines/artifacts.yml diff --git a/azure-pipelines/linux-install-gtk-dev-ninja.yml b/azure-pipelines/linux-install-gtk-dev-ninja.yml new file mode 100644 index 00000000..959d4c11 --- /dev/null +++ b/azure-pipelines/linux-install-gtk-dev-ninja.yml @@ -0,0 +1,6 @@ +# 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 b/azure-pipelines_linux index c484d052..1fbf9b23 100644 --- a/azure-pipelines_linux +++ b/azure-pipelines_linux @@ -13,14 +13,12 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - script: | - sudo apt-get install libgtk-3-dev ninja-build - displayName: 'Install Dependencies' + - template: azure-pipelines/linux-install-gtk-dev-ninja.yml - template: azure-pipelines/configure.yml parameters: defaultLibrary: shared - template: azure-pipelines/build.yml - - template: azure-pipelines/darwinunix-artifacts.yml + - template: azure-pipelines/artifacts.yml parameters: os: linux arch: amd64 @@ -37,14 +35,12 @@ jobs: steps: - template: azure-pipelines/setup-python3.yml - template: azure-pipelines/install-latest-meson.yml - - script: | - sudo apt-get install libgtk-3-dev ninja-build - displayName: 'Install Dependencies' + - template: azure-pipelines/linux-install-gtk-dev-ninja.yml - template: azure-pipelines/configure.yml parameters: defaultLibrary: static - template: azure-pipelines/build.yml - - template: azure-pipelines/darwinunix-artifacts.yml + - template: azure-pipelines/artifacts.yml parameters: os: linux arch: amd64 @@ -71,7 +67,7 @@ jobs: parameters: defaultLibrary: shared - template: azure-pipelines/build.yml - - template: azure-pipelines/darwinunix-artifacts.yml + - template: azure-pipelines/artifacts.yml parameters: os: darwin arch: amd64 @@ -93,7 +89,7 @@ jobs: parameters: defaultLibrary: static - template: azure-pipelines/build.yml - - template: azure-pipelines/darwinunix-artifacts.yml + - template: azure-pipelines/artifacts.yml parameters: os: darwin arch: amd64