File tree Expand file tree Collapse file tree 2 files changed +5
-15
lines changed Expand file tree Collapse file tree 2 files changed +5
-15
lines changed Original file line number Diff line number Diff line change @@ -49,15 +49,11 @@ commands:
4949
5050 - when :
5151 condition :
52- equal : [ debian, << parameters.os >> ]
52+ or :
53+ - equal : [ debian, << parameters.os >> ]
54+ - equal : [ linux, << parameters.os >> ]
5355 steps :
54- - run : apt-get update -y && apt-get install -y make
55-
56- - when :
57- condition :
58- equal : [ linux, << parameters.os >> ]
59- steps :
60- - run : sudo apt-get update -y && sudo apt-get install -y make
56+ - sudo run : apt-get update -y && sudo apt-get install -y make
6157
6258 - when :
6359 condition :
Original file line number Diff line number Diff line change @@ -4,13 +4,7 @@ EXECUTOR ?= $(OS)
44.PHONY : install-deps
55install-deps :
66# this assumes the linux executor on CircleCI runs ubuntu/debian
7- ifneq (,$(filter $(EXECUTOR ) ,debian) )
8- apt-get update
9- apt-get install --no-install-recommends -y \
10- build-essential ninja-build cmake \
11- python3 python3-dev python3-setuptools
12- endif
13- ifneq (,$(filter $(EXECUTOR ) ,linux) )
7+ ifneq (,$(filter $(EXECUTOR ) ,debian linux) )
148 sudo apt-get update
159 sudo apt-get install --no-install-recommends -y \
1610 build-essential ninja-build cmake \
You can’t perform that action at this time.
0 commit comments