diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5f5bce6..9019c92e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -131,7 +131,7 @@ jobs: fail-fast: false matrix: include: - - { toolset: gcc-11, install: g++-11, os: ubuntu-22.04, cxxstd: '17', build-type: 'Debug', ldflags: '' } + - { toolset: gcc-11, install: g++-11, container: ubuntu-22.04, os: ubuntu-latest, cxxstd: '17', build-type: 'Debug', ldflags: '' } - { toolset: gcc-11, install: g++-11, os: ubuntu-22.04, cxxstd: '20', build-type: 'Release', ldflags: '' } - { toolset: clang-11, install: clang-11, os: ubuntu-22.04, cxxstd: '17', build-type: 'Debug', ldflags: '' } - { toolset: clang-11, install: clang-11, os: ubuntu-22.04, cxxstd: '20', build-type: 'Debug', ldflags: '' } @@ -140,6 +140,7 @@ jobs: - { toolset: clang-14, install: 'clang-14 libc++-14-dev libc++abi-14-dev', os: ubuntu-22.04, cxxstd: '17', build-type: 'Debug', cxxflags: '-stdlib=libc++', ldflags: '-lc++' } - { toolset: clang-14, install: 'clang-14 libc++-14-dev libc++abi-14-dev', os: ubuntu-22.04, cxxstd: '20', build-type: 'Release', cxxflags: '-stdlib=libc++', ldflags: '-lc++' } runs-on: ${{ matrix.os }} + container: ${{matrix.container}} env: CXXFLAGS: ${{matrix.cxxflags}} -Wall -Wextra LDFLAGS: ${{matrix.ldflags}} @@ -148,8 +149,16 @@ jobs: - name: Checkout uses: actions/checkout@v3 + - name: Setup container environment + if: matrix.container + run: | + apt-get update + apt-get -y install sudo python git g++ + - name: Install dependencies - run: sudo apt-get -y install cmake protobuf-compiler redis-server python3 ${{ matrix.install }} + run: | + sudo apt-get update + sudo apt-get -y install cmake protobuf-compiler redis-server python3 ${{ matrix.install }} - name: Setup Boost run: ./tools/ci.py setup-boost --source-dir=$(pwd)