diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 02962aa8..eeb64547 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ on: # - build/worker/** # - overrides/** # - tests/** - # - compose.yml + # - compose.yaml # - docker-bake.hcl # - example.env @@ -25,7 +25,7 @@ on: # - build/worker/** # - overrides/** # - tests/** - # - compose.yml + # - compose.yaml # - docker-bake.hcl # - example.env diff --git a/compose.yml b/compose.yaml similarity index 100% rename from compose.yml rename to compose.yaml diff --git a/tests/compose.ci-erpnext.yml b/tests/compose.ci-erpnext.yaml similarity index 100% rename from tests/compose.ci-erpnext.yml rename to tests/compose.ci-erpnext.yaml diff --git a/tests/compose.ci-postgres.yml b/tests/compose.ci-postgres.yaml similarity index 100% rename from tests/compose.ci-postgres.yml rename to tests/compose.ci-postgres.yaml diff --git a/tests/compose.ci.yml b/tests/compose.ci.yaml similarity index 100% rename from tests/compose.ci.yml rename to tests/compose.ci.yaml diff --git a/tests/main.py b/tests/main.py index 57146a96..e56da3cc 100644 --- a/tests/main.py +++ b/tests/main.py @@ -88,10 +88,10 @@ def docker_compose(*cmd: str): "--env-file", "tests/.env", "-f", - "compose.yml", + "compose.yaml", ] if CI: - args.extend(("-f", "tests/compose.ci.yml")) + args.extend(("-f", "tests/compose.ci.yaml")) return run(*args, *cmd) @@ -319,7 +319,7 @@ def stop_s3_container(): @log("Recreate with https override") def recreate_with_https_override(): - docker_compose("-f", "overrides/compose.https.yml", "up", "-d", "--quiet-pull") + docker_compose("-f", "overrides/compose.https.yaml", "up", "-d", "--quiet-pull") @log("Check / (https)") @@ -334,9 +334,9 @@ def stop_containers(): @log("Recreate with ERPNext override") def create_containers_with_erpnext_override(): - args = ["-f", "overrides/compose.erpnext.yml"] + args = ["-f", "overrides/compose.erpnext.yaml"] if CI: - args.extend(("-f", "tests/compose.ci-erpnext.yml")) + args.extend(("-f", "tests/compose.ci-erpnext.yaml")) docker_compose(*args, "up", "-d", "--quiet-pull") @@ -376,9 +376,9 @@ def check_erpnext_assets(): @log("Create containers with Postgres override") def create_containers_with_postgres_override(): - args = ["-f", "overrides/compose.postgres.yml"] + args = ["-f", "overrides/compose.postgres.yaml"] if CI: - args.extend(("-f", "tests/compose.ci.postgres.yml")) + args.extend(("-f", "tests/compose.ci.postgres.yaml")) docker_compose(*args, "up", "-d", "--quiet-pull")