From 4e46d26a0bbbcea88528408288f4aefa7648bedc Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Mon, 29 Apr 2019 16:05:19 +0100 Subject: [PATCH] Fix BRANCH and apt-get --- Makefile | 2 +- azure-pipelines.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e1d22a53c..13c2831dd 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SHELL = bash -BRANCH := $(or $(APPVEYOR_REPO_BRANCH),$(TRAVIS_BRANCH),$(shell git rev-parse --abbrev-ref HEAD)) +BRANCH := $(or $(APPVEYOR_REPO_BRANCH),$(TRAVIS_BRANCH),$(BUILD_SOURCEBRANCHNAME),$(shell git rev-parse --abbrev-ref HEAD)) LAST_TAG := $(shell git describe --tags --abbrev=0) ifeq ($(BRANCH),$(LAST_TAG)) BRANCH := master diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6a4d0d9c3..914ec7885 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -74,7 +74,7 @@ steps: sudo modprobe fuse sudo chmod 666 /dev/fuse sudo chown root:$USER /etc/fuse.conf - sudo apt install fuse libfuse-dev rpm pkg-config + sudo apt-get install fuse libfuse-dev rpm pkg-config condition: eq( variables['Agent.OS'], 'Linux' ) displayName: Install Libraries on Linux