File tree 2 files changed +5
-15
lines changed
2 files changed +5
-15
lines changed Original file line number Diff line number Diff line change @@ -49,15 +49,11 @@ commands:
49
49
50
50
- when :
51
51
condition :
52
- equal : [ debian, << parameters.os >> ]
52
+ or :
53
+ - equal : [ debian, << parameters.os >> ]
54
+ - equal : [ linux, << parameters.os >> ]
53
55
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
61
57
62
58
- when :
63
59
condition :
Original file line number Diff line number Diff line change @@ -4,13 +4,7 @@ EXECUTOR ?= $(OS)
4
4
.PHONY : install-deps
5
5
install-deps :
6
6
# 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) )
14
8
sudo apt-get update
15
9
sudo apt-get install --no-install-recommends -y \
16
10
build-essential ninja-build cmake \
You can’t perform that action at this time.
0 commit comments