Skip to content

Commit

Permalink
CI - migrate to docker compose v2 (#6547)
Browse files Browse the repository at this point in the history
  • Loading branch information
pavoljuhas authored Apr 3, 2024
1 parent f9f0d66 commit bc3f9ff
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jobs:
-r dev_tools/requirements/deps/pytest.txt \
-r dev_tools/requirements/deps/notebook.txt
- name: Run Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
- name: Pytest check
run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --rigetti-integration --enable-slow-tests
- name: Stop Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
run: docker compose -f cirq-rigetti/docker-compose.test.yaml down
windows:
name: Pytest Windows
strategy:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ jobs:
pip install wheel
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
- name: Run Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
- name: Pytest check
run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib --rigetti-integration
- name: Stop Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
run: docker compose -f cirq-rigetti/docker-compose.test.yaml down
pip-compile:
name: Check consistency of requirements
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -221,15 +221,15 @@ jobs:
pip install wheel
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
- name: Run Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
- name: Coverage check
run: check/pytest-and-incremental-coverage -n auto --rigetti-integration
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Stop Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
run: docker compose -f cirq-rigetti/docker-compose.test.yaml down
windows:
name: Pytest Windows
strategy:
Expand Down
1 change: 0 additions & 1 deletion dev_tools/conf/apt-list-dev-tools.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
virtualenvwrapper
pandoc
docker-ce
docker-compose
6 changes: 3 additions & 3 deletions docs/dev/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ See the previous section for instructions.
```bash
cat apt-system-requirements.txt dev_tools/conf/apt-list-dev-tools.txt | xargs sudo apt-get install --yes
```
This installs docker and docker-compose among other things. You may need to restart
docker or configure permissions, see

This installs docker among other things. You may need to restart
docker or configure permissions, see
[docker install instructions](https://docs.docker.com/engine/install/ubuntu/).
Note that docker is necessary only for cirq_rigetti.

Expand Down

0 comments on commit bc3f9ff

Please sign in to comment.