Skip to content

Commit e24c87f

Browse files
authored
ci: ubuntu-18.04 environment is deprecated (#738)
* ci: ubuntu-18.04 environment is deprecated Switch to containers.
1 parent eabd679 commit e24c87f

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

.github/workflows/ci.yml

+20-9
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ jobs:
2020
include:
2121
- toolset: gcc-6
2222
cxxstd: "14,1z"
23-
os: ubuntu-18.04
23+
os: ubuntu-latest
24+
container: ubuntu:18.04
2425
install: g++-6
2526
- toolset: gcc-7
2627
cxxstd: "14,17"
27-
os: ubuntu-18.04
28-
- toolset: gcc
29-
compiler: g++-8
28+
install: g++-7
29+
os: ubuntu-20.04
30+
- toolset: gcc-8
3031
cxxstd: "14"
3132
os: ubuntu-20.04
3233
install: g++-8
@@ -41,17 +42,20 @@ jobs:
4142
- toolset: clang
4243
compiler: clang++-3.9
4344
cxxstd: "14"
44-
os: ubuntu-18.04
45+
os: ubuntu-latest
46+
container: ubuntu:18.04
4547
install: clang-3.9
4648
- toolset: clang
4749
compiler: clang++-4.0
4850
cxxstd: "14"
49-
os: ubuntu-18.04
51+
os: ubuntu-latest
52+
container: ubuntu:18.04
5053
install: clang-4.0
5154
- toolset: clang
5255
compiler: clang++-5.0
5356
cxxstd: "14,1z"
54-
os: ubuntu-18.04
57+
os: ubuntu-latest
58+
container: ubuntu:18.04
5559
install: clang-5.0
5660
- toolset: clang
5761
compiler: clang++-6.0
@@ -82,13 +86,20 @@ jobs:
8286
os: macos-11
8387

8488
runs-on: ${{matrix.os}}
89+
container: ${{matrix.container}}
8590

8691
steps:
8792
- uses: actions/checkout@v3
8893

94+
- name: Setup container environment
95+
if: matrix.container
96+
run: |
97+
apt-get -y update
98+
apt-get -y install sudo python3 git g++
99+
89100
- name: Install packages
90101
if: matrix.install
91-
run: sudo apt install ${{matrix.install}}
102+
run: sudo apt-get -y install ${{matrix.install}}
92103

93104
- name: Setup Boost
94105
run: |
@@ -99,7 +110,7 @@ jobs:
99110
cd boost-root
100111
cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
101112
git submodule update --init tools/boostdep
102-
python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
113+
python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
103114
./bootstrap.sh
104115
./b2 -d0 headers
105116

0 commit comments

Comments
 (0)