Skip to content

Commit 99b147c

Browse files
committed
Revert "[bfops/ci-caching]: revert docker changes to see how long things take"
This reverts commit c3ebef0.
1 parent 4139aae commit 99b147c

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
run: |
8282
# Our .dockerignore omits `target`, which our CI Dockerfile needs.
8383
rm .dockerignore
84-
docker compose up -d
84+
docker compose -f .github/docker-compose.yml up -d
8585
- name: Build and start database (Windows)
8686
if: runner.os == 'Windows'
8787
run: |
@@ -104,7 +104,7 @@ jobs:
104104
run: python -m smoketests ${{ matrix.smoketest_args }} -x clear_database replication teams
105105
- name: Stop containers (Linux)
106106
if: always() && runner.os == 'Linux'
107-
run: docker compose down
107+
run: docker compose -f .github/docker-compose.yml down
108108

109109
test:
110110
name: Test Suite

smoketests/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
REMOTE_SERVER = False
4949

5050
# default value can be overridden by `--compose-file` flag
51-
COMPOSE_FILE = "./docker-compose.yml"
51+
COMPOSE_FILE = ".github/docker-compose.yml"
5252

5353
# this will be initialized by main()
5454
STDB_CONFIG = ''

0 commit comments

Comments
 (0)