From 0c40042d8ee864fe4420fd316cd562a5d0f06f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cenk=20K=C3=BCc=C3=BCk?= Date: Fri, 11 Oct 2024 00:13:59 +0100 Subject: [PATCH] Update Clickhouse version in CI (#4617) * Update Clickhouse version in CI * update order * Update clickhouse image * Update Makefile --- .github/workflows/elixir.yml | 2 +- Makefile | 2 +- .../controllers/api/external_stats_controller/query_test.exs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index bc8cb0e8c9e7..ad045739159c 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -48,7 +48,7 @@ jobs: --health-timeout 5s --health-retries 5 clickhouse: - image: clickhouse/clickhouse-server:24.3.3.102-alpine + image: clickhouse/clickhouse-server:24.8.5.115-alpine ports: - 8123:8123 env: diff --git a/Makefile b/Makefile index a85ee3b8f06b..61da34f6d571 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ clickhouse: ## Start a container with a recent version of clickhouse docker run $(CH_FLAGS) --volume=$$PWD/.clickhouse_db_vol:/var/lib/clickhouse clickhouse/clickhouse-server:latest-alpine clickhouse-prod: ## Start a container with the same version of clickhouse as the one in prod - docker run $(CH_FLAGS) --volume=$$PWD/.clickhouse_db_vol_prod:/var/lib/clickhouse clickhouse/clickhouse-server:24.3.3.102-alpine + docker run $(CH_FLAGS) --volume=$$PWD/.clickhouse_db_vol_prod:/var/lib/clickhouse clickhouse/clickhouse-server:24.8.5.115-alpine clickhouse-stop: ## Stop and remove the clickhouse container docker stop plausible_clickhouse && docker rm plausible_clickhouse diff --git a/test/plausible_web/controllers/api/external_stats_controller/query_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_test.exs index 95c6ae1d9491..38dd48bf5f59 100644 --- a/test/plausible_web/controllers/api/external_stats_controller/query_test.exs +++ b/test/plausible_web/controllers/api/external_stats_controller/query_test.exs @@ -3105,8 +3105,8 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryTest do %{"results" => results} = json_response(conn, 200) assert results == [ - %{"dimensions" => ["/"], "metrics" => [2, 2, 2, 2, 50, 300]}, - %{"dimensions" => ["/plausible.io"], "metrics" => [2, 2, 2, 2, 100, 0]} + %{"dimensions" => ["/plausible.io"], "metrics" => [2, 2, 2, 2, 100, 0]}, + %{"dimensions" => ["/"], "metrics" => [2, 2, 2, 2, 50, 300]} ] end end