From 75541a7b74c7000a6ee0c0b45596171b9916e6f8 Mon Sep 17 00:00:00 2001 From: Greg Rychlewski Date: Wed, 14 Jan 2026 22:56:15 -0500 Subject: [PATCH 1/3] test --- .github/workflows/ci.yml | 9 ++++----- Earthfile | 8 ++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49c43ed6e..03332bd3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,16 +52,15 @@ jobs: fail-fast: false matrix: elixirbase: - - "1.14.5-erlang-23.3.4.9-alpine-3.16.9" + - "1.15.6-erlang-25.3.2.6-alpine-3.18.4" postgres: - "16.2-alpine" - "11.11-alpine" - "9.6-alpine" - - "9.5-alpine" pool_count: - "1" include: - - elixirbase: "1.14.5-erlang-23.3.4.9-alpine-3.16.9" + - elixirbase: "1.15.6-erlang-25.3.2.6-alpine-3.18.4" postgres: "16.2-alpine" pool_count: "4" steps: @@ -79,7 +78,7 @@ jobs: fail-fast: false matrix: elixirbase: - - "1.14.5-erlang-23.3.4.9-alpine-3.16.9" + - "1.15.6-erlang-25.3.2.6-alpine-3.18.4" mysql: - "5.7" - "8.0" @@ -96,7 +95,7 @@ jobs: fail-fast: false matrix: elixirbase: - - "1.14.5-erlang-23.3.4.9-alpine-3.16.9" + - "1.15.6-erlang-25.3.2.6-alpine-3.18.4" mssql: - "2019" - "2022" diff --git a/Earthfile b/Earthfile index 136d9a44d..c6c82c1a5 100644 --- a/Earthfile +++ b/Earthfile @@ -41,12 +41,7 @@ integration-test-postgres: FROM +setup-base ARG POSTGRES="11.11" - IF [ "$POSTGRES" = "9.5-alpine" ] - # for 9.5 we require a downgraded version of pg_dump; - # and in the 3.4 version, it is not included in postgresql-client but rather in postgresql - RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.4/main' >> /etc/apk/repositories - RUN apk add postgresql=9.5.13-r0 - ELSE IF [ "$POSTGRES" = "16.2-alpine" ] + IF [ "$POSTGRES" = "16.2-alpine" ] # for 16 we need an upgraded version of pg_dump; # alpine 3.16 does not come with the postgres 16 client by default; # we must first update the public keys for the packages because they @@ -78,6 +73,7 @@ integration-test-postgres: integration-test-mysql: FROM +setup-base + RUN apk del mariadb-client RUN apk add mysql-client DO +COMMON_SETUP_AND_MIX From 3ddd8865291ed722334c5a0a4e93897b759daf30 Mon Sep 17 00:00:00 2001 From: Greg Rychlewski Date: Wed, 14 Jan 2026 23:03:02 -0500 Subject: [PATCH 2/3] try again --- Earthfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Earthfile b/Earthfile index c6c82c1a5..cba755b8a 100644 --- a/Earthfile +++ b/Earthfile @@ -73,8 +73,7 @@ integration-test-postgres: integration-test-mysql: FROM +setup-base - RUN apk del mariadb-client - RUN apk add mysql-client + RUN apk del mariadb-client && apk add mysql-client DO +COMMON_SETUP_AND_MIX From 31d515cee6e120fd260fdfcf5e5233411494ebe3 Mon Sep 17 00:00:00 2001 From: Greg Rychlewski Date: Wed, 14 Jan 2026 23:10:48 -0500 Subject: [PATCH 3/3] try again --- Earthfile | 2 +- integration_test/myxql/storage_test.exs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Earthfile b/Earthfile index cba755b8a..33edb41d3 100644 --- a/Earthfile +++ b/Earthfile @@ -73,7 +73,7 @@ integration-test-postgres: integration-test-mysql: FROM +setup-base - RUN apk del mariadb-client && apk add mysql-client + RUN apk add mysql-client DO +COMMON_SETUP_AND_MIX diff --git a/integration_test/myxql/storage_test.exs b/integration_test/myxql/storage_test.exs index 901bbd44b..8df182351 100644 --- a/integration_test/myxql/storage_test.exs +++ b/integration_test/myxql/storage_test.exs @@ -202,6 +202,6 @@ defmodule Ecto.Integration.StorageTest do PoolRepo.config() ) - assert output =~ "INSERT INTO `schema_migrations` VALUES (" + assert output =~ "INSERT INTO `schema_migrations`" end end