From 827caa9e9fc25c4790131774c8d9ee3b55f9840d Mon Sep 17 00:00:00 2001 From: Andrii Andreiev <129078694+AndriiAndreiev@users.noreply.github.com> Date: Tue, 6 Aug 2024 17:13:15 +0300 Subject: [PATCH] fix(integration-tests): update docker compose syntax --- .github/workflows/dotnet.yml | 2 +- .github/workflows/nodejs.yml | 2 +- .github/workflows/php.yml | 2 +- .github/workflows/python.yml | 2 +- .github/workflows/ruby.yml | 2 +- Makefile | 30 +++++++++++++++--------------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 67bda155a2..a13114495e 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -21,7 +21,7 @@ jobs: - name: Cleanup if: always() - run: docker-compose down + run: docker compose down build: runs-on: ubuntu-latest diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index f8db8cc37a..f63b31e643 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -23,7 +23,7 @@ jobs: - name: Cleanup if: always() - run: docker-compose down + run: docker compose down build: runs-on: ubuntu-latest diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index c9d9d79cf1..ef8171c3ba 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -21,7 +21,7 @@ jobs: - name: Cleanup if: always() - run: docker-compose down + run: docker compose down build: runs-on: ubuntu-latest diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 948e7088bb..12e47a354f 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -22,7 +22,7 @@ jobs: - name: Cleanup if: always() - run: docker-compose down + run: docker compose down build: name: ${{ matrix.python-version }} on ${{ matrix.os }} diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 3d8021ed1d..7a2fcabe89 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -22,7 +22,7 @@ jobs: - name: Cleanup if: always() - run: docker-compose down + run: docker compose down build: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 03f038635f..11da6ad495 100644 --- a/Makefile +++ b/Makefile @@ -4,23 +4,23 @@ help: ## Display this help screen @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' cleanup: - @docker-compose down + @docker compose down cleanup-failure: - @docker-compose down + @docker compose down exit 1 ## ## .NET ## test-metrics-dotnet: ## Run Metrics tests against the .NET SDK - docker-compose up --build --detach integration_dotnet_metrics_v6.0 + docker compose up --build --detach integration_dotnet_metrics_v6.0 sleep 5 npm run test:integration-metrics || make cleanup-failure @make cleanup test-webhooks-dotnet: ## Run webhooks tests against the .NET SDK - docker-compose up --build --detach integration_dotnet_webhooks_v6.0 + docker compose up --build --detach integration_dotnet_webhooks_v6.0 npm run test:integration-webhooks || make cleanup-failure @make cleanup @@ -29,22 +29,22 @@ test-webhooks-dotnet: ## Run webhooks tests against the .NET SDK ## test-metrics-node-express: ## Run Metrics tests against the Node SDK + Express - docker-compose up --build --detach integration_node_express + docker compose up --build --detach integration_node_express SUPPORTS_HASHING=true npm run test:integration-metrics || make cleanup-failure @make cleanup test-webhooks-node-express: ## Run webhooks tests against the Node SDK + Express - docker-compose up --build --detach integration_node_express + docker compose up --build --detach integration_node_express npm run test:integration-webhooks || make cleanup-failure @make cleanup test-metrics-node-fastify: ## Run Metrics tests against the Node SDK + Fastify - docker-compose up --build --detach integration_node_fastify + docker compose up --build --detach integration_node_fastify SUPPORTS_HASHING=true npm run test:integration-metrics || make cleanup-failure @make cleanup test-metrics-node-hapi: ## Run Metrics tests against the Node SDK + hapi - docker-compose up --build --detach integration_node_hapi + docker compose up --build --detach integration_node_hapi SUPPORTS_HASHING=true npm run test:integration-metrics || make cleanup-failure @make cleanup @@ -53,12 +53,12 @@ test-metrics-node-hapi: ## Run Metrics tests against the Node SDK + hapi ## test-metrics-php-laravel: ## Run Metrics tests against the PHP SDK + Laravel - docker-compose up --build --detach integration_php_laravel + docker compose up --build --detach integration_php_laravel SUPPORTS_MULTIPART=true npm run test:integration-metrics || make cleanup-failure @make cleanup test-webhooks-php-laravel: ## Run webhooks tests against the PHP SDK + Laravel - docker-compose up --detach integration_php_laravel + docker compose up --detach integration_php_laravel SUPPORTS_MULTIPART=true npm run test:integration-webhooks || make cleanup-failure @make cleanup @@ -67,17 +67,17 @@ test-webhooks-php-laravel: ## Run webhooks tests against the PHP SDK + Laravel ## test-metrics-python-django: ## Run Metrics tests against the Python SDK + Django - docker-compose up --build --detach integration_metrics_python_django + docker compose up --build --detach integration_metrics_python_django npm run test:integration-metrics || make cleanup-failure @make cleanup test-metrics-python-flask: ## Run Metrics tests against the Python SDK + Flask - docker-compose up --build --detach integration_python_flask_metrics + docker compose up --build --detach integration_python_flask_metrics npm run test:integration-metrics || make cleanup-failure @make cleanup test-webhooks-python-flask: ## Run webhooks tests against the Python SDK + Flask - docker-compose up --build --detach integration_python_flask_webhooks + docker compose up --build --detach integration_python_flask_webhooks npm run test:integration-webhooks || make cleanup-failure @make cleanup @@ -91,13 +91,13 @@ test-webhooks-python-flask: ## Run webhooks tests against the Python SDK + Flask # This is the only thing that works consistently. It's not great but it'll do. test-metrics-ruby-rails: ## Run Metrics tests against the Ruby SDK + Rails - docker-compose up --build --detach integration_ruby_rails + docker compose up --build --detach integration_ruby_rails sleep 5 SUPPORTS_HASHING=true npm run test:integration-metrics || make cleanup-failure @make cleanup test-webhooks-ruby-rails: ## Run webhooks tests against the Ruby SDK + Rails - docker-compose up --build --detach integration_ruby_rails + docker compose up --build --detach integration_ruby_rails sleep 5 SUPPORTS_HASHING=true npm run test:integration-webhooks || make cleanup-failure @make cleanup