From e094a95f61a129c0181a0020d6fc156c22f5d69b Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Sun, 3 Aug 2025 10:59:36 +0100 Subject: [PATCH 1/5] Remove PostgreSQL and SQLite from Gemfile --- Gemfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gemfile b/Gemfile index f2a7b8885..3b7fc6d2e 100644 --- a/Gemfile +++ b/Gemfile @@ -7,8 +7,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec gem "bcrypt" -gem "pg", ">= 0.18.0" -gem "sqlite3", ">= 1.6.6" gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem "benchmark-ips" gem "minitest", ">= 5.15.0" From 20dd55d8db3e19cce6163f5a45491a782495091e Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Sun, 3 Aug 2025 11:13:18 +0100 Subject: [PATCH 2/5] Match PostgreSQL and SQLite versions used in Rails main --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 3b7fc6d2e..4e04f3a3a 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec gem "bcrypt" +gem "pg", "~> 1.3" +gem "sqlite3", ">= 2.1" gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem "benchmark-ips" gem "minitest", ">= 5.15.0" From 0872915f345296ef6113d7317121ea15c7a6e7ed Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Sun, 3 Aug 2025 11:50:16 +0100 Subject: [PATCH 3/5] Update ci.yml --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee0b1428b..2d291243d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,9 @@ jobs: - name: Build docker images run: docker compose build --build-arg TARGET_VERSION=${{ matrix.ruby }} + - name: Install libresolv + run: sudo apt-get update && sudo apt-get install -y libc6 + - name: Run tests run: docker compose run ci From efa2aa6974ce0a33c03cefe9370e2c8a4cbf4272 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Sun, 3 Aug 2025 11:52:44 +0100 Subject: [PATCH 4/5] Install libresolv --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d291243d..b67d8b606 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,7 @@ jobs: - name: Build docker images run: docker compose build --build-arg TARGET_VERSION=${{ matrix.ruby }} + # This step should be performed when creating the docker image instead of here. - name: Install libresolv run: sudo apt-get update && sudo apt-get install -y libc6 From a08a0b92f6d64bd8955ff10126f04c90f855af4e Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Sun, 3 Aug 2025 12:00:43 +0100 Subject: [PATCH 5/5] Lock PG to v1.5.9 --- .github/workflows/ci.yml | 4 ---- Gemfile | 2 +- compose.ci.yaml | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b67d8b606..ee0b1428b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,10 +31,6 @@ jobs: - name: Build docker images run: docker compose build --build-arg TARGET_VERSION=${{ matrix.ruby }} - # This step should be performed when creating the docker image instead of here. - - name: Install libresolv - run: sudo apt-get update && sudo apt-get install -y libc6 - - name: Run tests run: docker compose run ci diff --git a/Gemfile b/Gemfile index 4e04f3a3a..cbb406565 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec gem "bcrypt" -gem "pg", "~> 1.3" +gem "pg", "1.5.9" gem "sqlite3", ">= 2.1" gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem "benchmark-ips" diff --git a/compose.ci.yaml b/compose.ci.yaml index 1e02f057d..8242db9b8 100644 --- a/compose.ci.yaml +++ b/compose.ci.yaml @@ -1,4 +1,3 @@ -version: "2.2" services: sqlserver: image: ghcr.io/rails-sqlserver/mssql-server-linux-rails