Skip to content

Commit 6a2b058

Browse files
dejandejan
authored
Merge pull request #183 from leoarnold/leoarnold/meta_request/rails-7
Add Rails 7.0 to CI
2 parents 6374dbe + 718639a commit 6a2b058

File tree

11 files changed

+134
-57
lines changed

11 files changed

+134
-57
lines changed

‎.circleci/config.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,16 @@ jobs:
8080
- setup_remote_docker
8181
- run: docker-compose run --rm test-rails-6.1
8282

83+
test_rails_7_0:
84+
docker:
85+
- image: circleci/buildpack-deps
86+
working_directory: ~/project/meta_request
87+
steps:
88+
- checkout:
89+
path: ~/project
90+
- setup_remote_docker
91+
- run: docker-compose run --rm test-rails-7.0
92+
8393
workflows:
8494
version: 2
8595
test_all:
@@ -92,3 +102,4 @@ workflows:
92102
- test_rails_5_2
93103
- test_rails_6_0
94104
- test_rails_6_1
105+
- test_rails_7_0

‎meta_request/Dockerfile-rails-4.2‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
FROM ruby:2.6-alpine
22

33
RUN apk add --update --no-cache \
4-
build-base curl-dev git sqlite-dev \
5-
yaml-dev zlib-dev nodejs yarn tzdata
4+
build-base \
5+
curl-dev \
6+
git \
7+
nodejs \
8+
sqlite-dev \
9+
tzdata \
10+
yaml-dev \
11+
yarn \
12+
zlib-dev
613

714
RUN mkdir /app /gem
815
WORKDIR /app
@@ -12,14 +19,10 @@ RUN rails new . --skip-spring
1219

1320
RUN bundle remove sqlite3
1421
RUN bundle add sqlite3 --version '~> 1.3.6'
15-
RUN bundle install
1622

1723
COPY . /gem
18-
19-
RUN gem build /gem/meta_request.gemspec
20-
RUN gem install /gem/meta_request-*.gem
21-
RUN bundle add meta_request
22-
RUN bundle install --local
24+
RUN echo 'gem "meta_request", path: "/gem"' >> Gemfile
25+
RUN bundle install
2326

2427
COPY res/routes.rb /app/config/
2528
COPY res/dummy_controller.rb /app/app/controllers/

‎meta_request/Dockerfile-rails-5.0‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
FROM ruby:2.6-alpine
22

33
RUN apk add --update --no-cache \
4-
build-base curl-dev git sqlite-dev \
5-
yaml-dev zlib-dev nodejs yarn tzdata
4+
build-base \
5+
curl-dev \
6+
git \
7+
nodejs \
8+
sqlite-dev \
9+
tzdata \
10+
yaml-dev \
11+
yarn \
12+
zlib-dev
613

714
RUN mkdir /app /gem
815
WORKDIR /app
916

17+
RUN gem update --system
1018
RUN gem install rails -v 5.0.7.2
1119
RUN rails new .
1220

1321
RUN bundle remove sqlite3
1422
RUN bundle add sqlite3 --version '~> 1.3.6'
15-
RUN bundle install
16-
1723
COPY . /gem
18-
19-
RUN gem build /gem/meta_request.gemspec
20-
RUN gem install /gem/meta_request-*.gem
21-
RUN bundle add meta_request
22-
RUN bundle install --local
24+
RUN bundle add meta_request --path /gem
25+
RUN bundle install
2326

2427
COPY res/routes.rb /app/config/
2528
COPY res/dummy_controller.rb /app/app/controllers/

‎meta_request/Dockerfile-rails-5.1‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
FROM ruby:2.6-alpine
22

33
RUN apk add --update --no-cache \
4-
build-base curl-dev git sqlite-dev \
5-
yaml-dev zlib-dev nodejs yarn tzdata
4+
build-base \
5+
curl-dev \
6+
git \
7+
nodejs \
8+
sqlite-dev \
9+
tzdata \
10+
yaml-dev \
11+
yarn \
12+
zlib-dev
613

714
RUN mkdir /app /gem
815
WORKDIR /app
916

17+
RUN gem update --system
1018
RUN gem install rails -v 5.1.7
1119
RUN rails new .
1220

13-
RUN bundle install
14-
1521
COPY . /gem
16-
17-
RUN gem build /gem/meta_request.gemspec
18-
RUN gem install /gem/meta_request-*.gem
19-
RUN bundle add meta_request
20-
RUN bundle install --local
22+
RUN bundle add meta_request --path /gem
23+
RUN bundle install
2124

2225
COPY res/routes.rb /app/config/
2326
COPY res/dummy_controller.rb /app/app/controllers/

‎meta_request/Dockerfile-rails-5.2‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
FROM ruby:2.6-alpine
22

33
RUN apk add --update --no-cache \
4-
build-base curl-dev git sqlite-dev \
5-
yaml-dev zlib-dev nodejs yarn tzdata
4+
build-base \
5+
curl-dev \
6+
git \
7+
nodejs \
8+
shared-mime-info \
9+
sqlite-dev \
10+
tzdata \
11+
yaml-dev \
12+
yarn \
13+
zlib-dev
614

715
RUN mkdir /app /gem
816
WORKDIR /app
917

18+
RUN gem update --system
1019
RUN gem install rails -v 5.2.3
1120
RUN rails new .
1221

13-
RUN bundle install
14-
1522
COPY . /gem
16-
17-
RUN gem build /gem/meta_request.gemspec
18-
RUN gem install /gem/meta_request-*.gem
19-
RUN bundle add meta_request
20-
RUN bundle install --local
23+
RUN bundle add meta_request --path /gem
24+
RUN bundle install
2125

2226
COPY res/routes.rb /app/config/
2327
COPY res/dummy_controller.rb /app/app/controllers/

‎meta_request/Dockerfile-rails-6.0‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
FROM ruby:2.6-alpine
22

33
RUN apk add --update --no-cache \
4-
build-base curl-dev git sqlite-dev \
5-
yaml-dev zlib-dev nodejs yarn tzdata
4+
build-base \
5+
curl-dev \
6+
git \
7+
nodejs \
8+
shared-mime-info \
9+
sqlite-dev \
10+
tzdata \
11+
yaml-dev \
12+
yarn \
13+
zlib-dev
614

715
RUN mkdir /app /gem
816
WORKDIR /app
917

10-
RUN gem install rails -v 6.0.0.rc2
18+
RUN gem update --system
19+
RUN gem install rails -v 6.0.6
1120
RUN rails new .
1221

13-
RUN bundle install
14-
1522
COPY . /gem
16-
17-
RUN gem build /gem/meta_request.gemspec
18-
RUN gem install /gem/meta_request-*.gem
19-
RUN bundle add meta_request
20-
RUN bundle install --local
23+
RUN bundle add meta_request --path /gem
24+
RUN bundle install
2125

2226
COPY res/routes.rb /app/config/
2327
COPY res/dummy_controller.rb /app/app/controllers/
@@ -26,6 +30,12 @@ COPY res/meta_request_test.rb /app/test/integration/
2630

2731
RUN bundle exec rails db:migrate
2832

33+
# Webpacker 4 does not work well with Node v16
34+
RUN bundle remove webpacker
35+
RUN bundle add webpacker -v 5.4.3
36+
RUN bundle install
37+
RUN bundle exec rails webpacker:install
38+
2939
ENV PARALLEL_WORKERS 1
3040

3141
CMD ["bin/rake"]

‎meta_request/Dockerfile-rails-6.1‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
FROM ruby:2.6-alpine
22

33
RUN apk add --update --no-cache \
4-
build-base curl-dev git sqlite-dev \
5-
yaml-dev zlib-dev nodejs yarn tzdata
4+
build-base \
5+
curl-dev \
6+
git \
7+
nodejs \
8+
shared-mime-info \
9+
sqlite-dev \
10+
tzdata \
11+
yaml-dev \
12+
yarn \
13+
zlib-dev
614

715
RUN mkdir /app /gem
816
WORKDIR /app
917

10-
RUN gem install rails -v 6.1.0
18+
RUN gem update --system
19+
RUN gem install rails -v 6.1.7
1120
RUN rails new .
1221

13-
RUN bundle install
14-
1522
COPY . /gem
16-
17-
RUN gem build /gem/meta_request.gemspec
18-
RUN gem install /gem/meta_request-*.gem
19-
RUN bundle add meta_request
20-
RUN bundle install --local
23+
RUN bundle add meta_request --path /gem
24+
RUN bundle install
2125

2226
COPY res/routes.rb /app/config/
2327
COPY res/dummy_controller.rb /app/app/controllers/

‎meta_request/Dockerfile-rails-7.0‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
FROM ruby:3.0-alpine
2+
3+
RUN apk add --update --no-cache \
4+
build-base \
5+
curl-dev \
6+
git \
7+
nodejs \
8+
shared-mime-info \
9+
sqlite-dev \
10+
tzdata \
11+
yaml-dev \
12+
yarn \
13+
zlib-dev
14+
15+
RUN mkdir /app /gem
16+
WORKDIR /app
17+
18+
RUN gem update --system
19+
RUN gem install rails -v 7.0.4
20+
RUN rails new .
21+
22+
COPY . /gem
23+
RUN bundle add meta_request --path /gem
24+
RUN bundle install
25+
26+
COPY res/routes.rb /app/config/
27+
COPY res/dummy_controller.rb /app/app/controllers/
28+
COPY res/dummy /app/app/views/dummy
29+
COPY res/meta_request_test.rb /app/test/integration/
30+
31+
RUN bundle exec rails db:migrate
32+
33+
ENV PARALLEL_WORKERS 1
34+
35+
CMD ["bin/rake"]

‎meta_request/docker-compose.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ services:
2929
build:
3030
context: .
3131
dockerfile: Dockerfile-rails-6.1
32+
test-rails-7.0:
33+
build:
34+
context: .
35+
dockerfile: Dockerfile-rails-7.0

‎meta_request/meta_request.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
1313
gem.license = 'MIT'
1414

1515
gem.add_dependency 'rack-contrib', '>= 1.1', '< 3'
16-
gem.add_dependency 'railties', '>= 3.0.0', '< 7'
16+
gem.add_dependency 'railties', '>= 3.0.0', '< 7.1'
1717
gem.add_development_dependency 'rspec', '~> 3.8.0'
1818
gem.add_development_dependency 'rubocop', '~> 0.74.0'
1919

0 commit comments

Comments
 (0)