Skip to content

Commit

Permalink
Move default build to Ruby 3.3, test only MySQL for Rubies 3.1 & 3.2 …
Browse files Browse the repository at this point in the history
…(middle versions)
  • Loading branch information
ZeiP committed Jun 17, 2024
1 parent 6274e9e commit d5235e8
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 102 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ jobs:
ruby: ["3.0", "3.1", "3.2", "3.3"]
db: [sqlite, mysql, postgres]
exclude:
- ruby: "3.1"
db: sqlite
- ruby: "3.1"
db: postgres
- ruby: "3.2"
db: sqlite
- ruby: "3.2"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1
FROM ruby:3.3

# throw errors if Gemfile has been modified since Gemfile.lock
RUN bundle config --global frozen 1
Expand All @@ -8,7 +8,7 @@ WORKDIR /app
RUN touch /etc/app-env

COPY Gemfile* /app/
RUN gem install bundler -v 2.4.22
RUN gem install bundler
RUN bundle install --jobs 4

RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-3.3 → Dockerfile-3.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2
FROM ruby:3.1

# throw errors if Gemfile has been modified since Gemfile.lock
RUN bundle config --global frozen 1
Expand Down
2 changes: 1 addition & 1 deletion test-envs/docker-compose-3.1-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
web:
build:
context: ..
dockerfile: Dockerfile
dockerfile: Dockerfile-3.1
environment:
# These are set in script/ci-build, so we need to pass-thru them.
RAILS_ENV: $RAILS_ENV
Expand Down
32 changes: 0 additions & 32 deletions test-envs/docker-compose-3.1-postgres.yml

This file was deleted.

17 changes: 0 additions & 17 deletions test-envs/docker-compose-3.1-sqlite.yml

This file was deleted.

32 changes: 0 additions & 32 deletions test-envs/docker-compose-3.2-postgres.yml

This file was deleted.

17 changes: 0 additions & 17 deletions test-envs/docker-compose-3.2-sqlite.yml

This file was deleted.

0 comments on commit d5235e8

Please sign in to comment.