diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f471185..dab0950b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,6 +19,29 @@ jobs: rspec: name: Solidus ${{ matrix.solidus-branch }}, Rails ${{ matrix.rails-version }} and Ruby ${{ matrix.ruby-version }} on ${{ matrix.database }} runs-on: ubuntu-24.04 + services: + postgres: + image: postgres:16 + env: + POSTGRES_HOST_AUTH_METHOD: trust + options: >- + --health-cmd="pg_isready" + --health-interval=10s + --health-timeout=5s + --health-retries=5 + ports: + - 5432:5432 + mysql: + image: mysql:8 + env: + MYSQL_ALLOW_EMPTY_PASSWORD: "yes" + options: >- + --health-cmd="mysqladmin ping" + --health-interval=10s + --health-timeout=5s + --health-retries=5 + ports: + - 3306:3306 strategy: fail-fast: false matrix: diff --git a/Gemfile b/Gemfile index 22dbb571..b6ae6ad6 100644 --- a/Gemfile +++ b/Gemfile @@ -7,8 +7,8 @@ branch = ENV.fetch("SOLIDUS_BRANCH", "main") gem "solidus", github: "solidusio/solidus", branch: branch gem "solidus_backend", github: "solidusio/solidus", branch: branch -rails_requirement_string = ENV.fetch("RAILS_VERSION", "~> 7.0") -gem "rails", rails_requirement_string +rails_requirement_string = ENV.fetch("RAILS_VERSION", "7.0") +gem "rails", "~> #{rails_requirement_string}" # The solidus_frontend gem has been pulled out since v3.2 if branch >= "v3.2"