Skip to content

Commit 640f2c3

Browse files
authored
Merge pull request #267 from solidusio/fix-db-env
CI: Setup database services
2 parents 8e6280a + b0e101a commit 640f2c3

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

.github/workflows/test.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,29 @@ jobs:
1919
rspec:
2020
name: Solidus ${{ matrix.solidus-branch }}, Rails ${{ matrix.rails-version }} and Ruby ${{ matrix.ruby-version }} on ${{ matrix.database }}
2121
runs-on: ubuntu-24.04
22+
services:
23+
postgres:
24+
image: postgres:16
25+
env:
26+
POSTGRES_HOST_AUTH_METHOD: trust
27+
options: >-
28+
--health-cmd="pg_isready"
29+
--health-interval=10s
30+
--health-timeout=5s
31+
--health-retries=5
32+
ports:
33+
- 5432:5432
34+
mysql:
35+
image: mysql:8
36+
env:
37+
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
38+
options: >-
39+
--health-cmd="mysqladmin ping"
40+
--health-interval=10s
41+
--health-timeout=5s
42+
--health-retries=5
43+
ports:
44+
- 3306:3306
2245
strategy:
2346
fail-fast: false
2447
matrix:

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ branch = ENV.fetch("SOLIDUS_BRANCH", "main")
77
gem "solidus", github: "solidusio/solidus", branch: branch
88
gem "solidus_backend", github: "solidusio/solidus", branch: branch
99

10-
rails_requirement_string = ENV.fetch("RAILS_VERSION", "~> 7.0")
11-
gem "rails", rails_requirement_string
10+
rails_requirement_string = ENV.fetch("RAILS_VERSION", "7.0")
11+
gem "rails", "~> #{rails_requirement_string}"
1212

1313
# The solidus_frontend gem has been pulled out since v3.2
1414
if branch >= "v3.2"

0 commit comments

Comments
 (0)