diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f367c9eb..d0967d0f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -203,26 +203,25 @@ jobs: CXXFLAGS: ${{matrix.cxxflags}} -Wall -Wextra LDFLAGS: ${{matrix.ldflags}} CMAKE_BUILD_PARALLEL_LEVEL: 4 - BOOST_REDIS_TEST_SERVER: redis - - services: - redis: - image: redis steps: - name: Checkout uses: actions/checkout@v3 - - name: Setup container environment - if: matrix.container - run: | - apt-get update - apt-get -y install sudo python3 git g++ libssl-dev protobuf-compiler redis-server - - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y install cmake protobuf-compiler redis-server python3 ${{ matrix.install }} + sudo apt-get -y --no-install-recommends install \ + cmake + protobuf-compiler + python3 \ + docker-compose-v2 \ + ${{ matrix.install }} + + - name: Set up a Redis server + run: | + cd tools + docker compose up -d --wait || (docker compose logs; exit 1) - name: Setup Boost run: ./tools/ci.py setup-boost --source-dir=$(pwd) diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml new file mode 100644 index 00000000..b42763d3 --- /dev/null +++ b/tools/docker-compose.yml @@ -0,0 +1,16 @@ +services: + redis: + image: "redis:alpine" + command: [ + "redis-server", + "--tls-port", "6380", + "--tls-cert-file", "/tls/server.crt", + "--tls-key-file", "/tls/server-key.key", + "--tls-ca-cert-file", "/tls/ca.crt", + "--tls-auth-clients", "no", + ] + volumes: + - ./tls:/tls + ports: + - 6379:6379 + - 6380:6380