diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49c43ed6..03332bd3 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 136d9a44..33edb41d 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 diff --git a/integration_test/myxql/storage_test.exs b/integration_test/myxql/storage_test.exs index 901bbd44..8df18235 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