From ce771903e5ee2168bffef36eab947e33e0b6fff4 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Thu, 3 Oct 2019 04:46:49 +1300 Subject: [PATCH 1/4] Trying to fix Azure Pipelines --- .azure/azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index 851259b43..99b034568 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -18,6 +18,7 @@ steps: set -e curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain `cat rust-toolchain` export PATH=$HOME/.cargo/bin:$PATH + apt-get -y install libxcb-composite0-dev libx11-dev rustc -Vv echo "##vso[task.prependpath]$HOME/.cargo/bin" rustup component add rustfmt --toolchain `cat rust-toolchain` From 03728c1868e92f4503c44bff98c3fa61b5a341ef Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Thu, 3 Oct 2019 04:55:29 +1300 Subject: [PATCH 2/4] Update azure-pipelines.yml --- .azure/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index 99b034568..13c8c8ec5 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -18,7 +18,7 @@ steps: set -e curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain `cat rust-toolchain` export PATH=$HOME/.cargo/bin:$PATH - apt-get -y install libxcb-composite0-dev libx11-dev + sudo apt-get -y install libxcb-composite0-dev libx11-dev rustc -Vv echo "##vso[task.prependpath]$HOME/.cargo/bin" rustup component add rustfmt --toolchain `cat rust-toolchain` From f689434bbc839ec115a2006af297a6e94f662c10 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Thu, 3 Oct 2019 05:06:28 +1300 Subject: [PATCH 3/4] Update azure-pipelines.yml --- .azure/azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index 13c8c8ec5..4a5669afb 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -5,6 +5,8 @@ strategy: matrix: linux-nightly: image: ubuntu-16.04 + commands: + - sudo apt-get -y install libxcb-composite0-dev libx11-dev macos-nightly: image: macos-10.14 windows-nightly: @@ -18,7 +20,6 @@ steps: set -e curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain `cat rust-toolchain` export PATH=$HOME/.cargo/bin:$PATH - sudo apt-get -y install libxcb-composite0-dev libx11-dev rustc -Vv echo "##vso[task.prependpath]$HOME/.cargo/bin" rustup component add rustfmt --toolchain `cat rust-toolchain` From 27272d37544e577b944c9725a70c322da9f782df Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Thu, 3 Oct 2019 05:27:03 +1300 Subject: [PATCH 4/4] Update azure-pipelines.yml --- .azure/azure-pipelines.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index 4a5669afb..e1f9b9368 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -5,8 +5,6 @@ strategy: matrix: linux-nightly: image: ubuntu-16.04 - commands: - - sudo apt-get -y install libxcb-composite0-dev libx11-dev macos-nightly: image: macos-10.14 windows-nightly: @@ -18,6 +16,10 @@ pool: steps: - bash: | set -e + if [ -e /etc/debian_version ] + then + sudo apt-get -y install libxcb-composite0-dev libx11-dev + fi curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain `cat rust-toolchain` export PATH=$HOME/.cargo/bin:$PATH rustc -Vv