Skip to content

Commit 91f28b4

Browse files
committed
[ci skip] Update GitHub actions to build versions that still need boost thread library.
1 parent 7af8c05 commit 91f28b4

File tree

2 files changed

+35
-2
lines changed

2 files changed

+35
-2
lines changed
Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
name: 'Install Packages (apt)'
22
description: 'Install required packages using apt'
3+
4+
inputs:
5+
need-boost-system:
6+
description: 'whether version under test needs boost thread library'
7+
required: false
8+
default: false
9+
need-boost-thread:
10+
description: 'whether version under test needs boost thread library'
11+
required: false
12+
default: false
13+
314
runs:
415
using: "composite"
516
steps:
617
- shell: bash
718
run: |
819
# Make sure our package list is up to date
920
sudo apt-get update
10-
# Make sure we have all the libraries we want,
11-
# but don't bother upgrading pre-installed ones.
21+
# Make sure we have all the libraries we want,
22+
# but don't bother upgrading pre-installed ones.
1223
sudo apt-get install --no-upgrade \
1324
libboost-dev \
1425
libboost-date-time-dev \
@@ -18,5 +29,12 @@ runs:
1829
libtiff-dev \
1930
libopenexr-dev \
2031
libsdl-dev
32+
# Only install the following if we plan on needing them
33+
if {{ $inputs.need-boost-system }} ; then
34+
sudo apt-get install --no-upgrade libboost-system-dev
35+
fi
36+
if {{ $inputs.need-boost-thread }} ; then
37+
sudo apt-get install --no-upgrade libboost-thread-dev
38+
fi
2139
# Make sure we have all the tools we want
2240
# (nothing here at the moment)

.github/actions/unix_getlibs_brew/action.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
name: 'Install Packages (brew)'
22
description: 'Install required packages using brew'
3+
4+
inputs:
5+
need-boost-system:
6+
# NB: Brew only has one boost package, which we need to have anyway, so this input is ignored.
7+
# However, we keep it around for consistency with the other package installation actions.
8+
description: 'whether version under test needs boost thread library'
9+
required: false
10+
default: false
11+
need-boost-thread:
12+
# NB: Brew only has one boost package, which we need to have anyway, so this input is ignored.
13+
# However, we keep it around for consistency with the other package installation actions.
14+
description: 'whether version under test needs boost thread library'
15+
required: false
16+
default: false
17+
318
runs:
419
using: "composite"
520
steps:

0 commit comments

Comments
 (0)