Skip to content

Commit 938f706

Browse files
jonasjabarijonasjabari
committed
added rails 7 spec run in CI, removing matestack-ui-vue_js spec run in CI, leaving matestack-ui-vue_js code and specs in repo for local testing until finally released 3.0.0
1 parent 8f31d98 commit 938f706

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+44988
-107
lines changed

‎.github/workflows/dockerpush.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@ name: specs
33
on: [push]
44

55
jobs:
6+
test_7_0_ruby_3_0:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Run tests
11+
run: |
12+
docker-compose -f ./ci/docker-compose.ci.yml run --rm test_7_0_ruby_3_0
13+
- name: Upload lock files
14+
uses: actions/upload-artifact@v2
15+
with:
16+
name: lockfiles_test_7_0_ruby_3_0
17+
path: |
18+
./ci/artifacts/yarn.lock
19+
./ci/artifacts/Gemfile.lock
620
test_6_1_ruby_3_0:
721
runs-on: ubuntu-latest
822
steps:

‎Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ gemspec
1111
# Git. Remember to move these dependencies to your gemspec before releasing
1212
# your gem to rubygems.org.
1313

14+
gem 'rails', '7.0.1'
15+
1416
group :development, :test do
1517
gem 'rspec-rails', '~> 4.0.2'
1618
gem 'capybara'

‎Gemfile.lock

Lines changed: 94 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -7,65 +7,71 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
actioncable (6.1.3.2)
11-
actionpack (= 6.1.3.2)
12-
activesupport (= 6.1.3.2)
10+
actioncable (7.0.1)
11+
actionpack (= 7.0.1)
12+
activesupport (= 7.0.1)
1313
nio4r (~> 2.0)
1414
websocket-driver (>= 0.6.1)
15-
actionmailbox (6.1.3.2)
16-
actionpack (= 6.1.3.2)
17-
activejob (= 6.1.3.2)
18-
activerecord (= 6.1.3.2)
19-
activestorage (= 6.1.3.2)
20-
activesupport (= 6.1.3.2)
15+
actionmailbox (7.0.1)
16+
actionpack (= 7.0.1)
17+
activejob (= 7.0.1)
18+
activerecord (= 7.0.1)
19+
activestorage (= 7.0.1)
20+
activesupport (= 7.0.1)
2121
mail (>= 2.7.1)
22-
actionmailer (6.1.3.2)
23-
actionpack (= 6.1.3.2)
24-
actionview (= 6.1.3.2)
25-
activejob (= 6.1.3.2)
26-
activesupport (= 6.1.3.2)
22+
net-imap
23+
net-pop
24+
net-smtp
25+
actionmailer (7.0.1)
26+
actionpack (= 7.0.1)
27+
actionview (= 7.0.1)
28+
activejob (= 7.0.1)
29+
activesupport (= 7.0.1)
2730
mail (~> 2.5, >= 2.5.4)
31+
net-imap
32+
net-pop
33+
net-smtp
2834
rails-dom-testing (~> 2.0)
29-
actionpack (6.1.3.2)
30-
actionview (= 6.1.3.2)
31-
activesupport (= 6.1.3.2)
32-
rack (~> 2.0, >= 2.0.9)
35+
actionpack (7.0.1)
36+
actionview (= 7.0.1)
37+
activesupport (= 7.0.1)
38+
rack (~> 2.0, >= 2.2.0)
3339
rack-test (>= 0.6.3)
3440
rails-dom-testing (~> 2.0)
3541
rails-html-sanitizer (~> 1.0, >= 1.2.0)
36-
actiontext (6.1.3.2)
37-
actionpack (= 6.1.3.2)
38-
activerecord (= 6.1.3.2)
39-
activestorage (= 6.1.3.2)
40-
activesupport (= 6.1.3.2)
42+
actiontext (7.0.1)
43+
actionpack (= 7.0.1)
44+
activerecord (= 7.0.1)
45+
activestorage (= 7.0.1)
46+
activesupport (= 7.0.1)
47+
globalid (>= 0.6.0)
4148
nokogiri (>= 1.8.5)
42-
actionview (6.1.3.2)
43-
activesupport (= 6.1.3.2)
49+
actionview (7.0.1)
50+
activesupport (= 7.0.1)
4451
builder (~> 3.1)
4552
erubi (~> 1.4)
4653
rails-dom-testing (~> 2.0)
4754
rails-html-sanitizer (~> 1.1, >= 1.2.0)
48-
activejob (6.1.3.2)
49-
activesupport (= 6.1.3.2)
55+
activejob (7.0.1)
56+
activesupport (= 7.0.1)
5057
globalid (>= 0.3.6)
51-
activemodel (6.1.3.2)
52-
activesupport (= 6.1.3.2)
53-
activerecord (6.1.3.2)
54-
activemodel (= 6.1.3.2)
55-
activesupport (= 6.1.3.2)
56-
activestorage (6.1.3.2)
57-
actionpack (= 6.1.3.2)
58-
activejob (= 6.1.3.2)
59-
activerecord (= 6.1.3.2)
60-
activesupport (= 6.1.3.2)
61-
marcel (~> 1.0.0)
62-
mini_mime (~> 1.0.2)
63-
activesupport (6.1.3.2)
58+
activemodel (7.0.1)
59+
activesupport (= 7.0.1)
60+
activerecord (7.0.1)
61+
activemodel (= 7.0.1)
62+
activesupport (= 7.0.1)
63+
activestorage (7.0.1)
64+
actionpack (= 7.0.1)
65+
activejob (= 7.0.1)
66+
activerecord (= 7.0.1)
67+
activesupport (= 7.0.1)
68+
marcel (~> 1.0)
69+
mini_mime (>= 1.1.0)
70+
activesupport (7.0.1)
6471
concurrent-ruby (~> 1.0, >= 1.0.2)
6572
i18n (>= 1.6, < 2)
6673
minitest (>= 5.1)
6774
tzinfo (~> 2.0)
68-
zeitwerk (~> 2.3)
6975
addressable (2.7.0)
7076
public_suffix (>= 2.0.2, < 5.0)
7177
builder (3.2.4)
@@ -85,28 +91,45 @@ GEM
8591
rexml
8692
crass (1.0.6)
8793
diff-lcs (1.4.4)
94+
digest (3.1.0)
8895
docile (1.4.0)
8996
erubi (1.10.0)
9097
generator_spec (0.9.4)
9198
activesupport (>= 3.0.0)
9299
railties (>= 3.0.0)
93-
globalid (0.4.2)
94-
activesupport (>= 4.2.0)
100+
globalid (1.0.0)
101+
activesupport (>= 5.0)
95102
hashdiff (1.0.1)
96-
i18n (1.8.11)
103+
i18n (1.9.1)
97104
concurrent-ruby (~> 1.0)
105+
io-wait (0.2.1)
98106
loofah (2.13.0)
99107
crass (~> 1.0.2)
100108
nokogiri (>= 1.5.9)
101109
mail (2.7.1)
102110
mini_mime (>= 0.1.1)
103-
marcel (1.0.1)
111+
marcel (1.0.2)
104112
method_source (1.0.0)
105-
mini_mime (1.0.3)
113+
mini_mime (1.1.2)
106114
mini_portile2 (2.7.1)
107115
minitest (5.15.0)
108-
nio4r (2.5.7)
109-
nokogiri (1.13.0)
116+
net-imap (0.2.3)
117+
digest
118+
net-protocol
119+
strscan
120+
net-pop (0.1.1)
121+
digest
122+
net-protocol
123+
timeout
124+
net-protocol (0.1.2)
125+
io-wait
126+
timeout
127+
net-smtp (0.3.1)
128+
digest
129+
net-protocol
130+
timeout
131+
nio4r (2.5.8)
132+
nokogiri (1.13.1)
110133
mini_portile2 (~> 2.7.0)
111134
racc (~> 1.4)
112135
pg (1.2.3)
@@ -127,32 +150,32 @@ GEM
127150
rack
128151
rack-test (1.1.0)
129152
rack (>= 1.0, < 3)
130-
rails (6.1.3.2)
131-
actioncable (= 6.1.3.2)
132-
actionmailbox (= 6.1.3.2)
133-
actionmailer (= 6.1.3.2)
134-
actionpack (= 6.1.3.2)
135-
actiontext (= 6.1.3.2)
136-
actionview (= 6.1.3.2)
137-
activejob (= 6.1.3.2)
138-
activemodel (= 6.1.3.2)
139-
activerecord (= 6.1.3.2)
140-
activestorage (= 6.1.3.2)
141-
activesupport (= 6.1.3.2)
153+
rails (7.0.1)
154+
actioncable (= 7.0.1)
155+
actionmailbox (= 7.0.1)
156+
actionmailer (= 7.0.1)
157+
actionpack (= 7.0.1)
158+
actiontext (= 7.0.1)
159+
actionview (= 7.0.1)
160+
activejob (= 7.0.1)
161+
activemodel (= 7.0.1)
162+
activerecord (= 7.0.1)
163+
activestorage (= 7.0.1)
164+
activesupport (= 7.0.1)
142165
bundler (>= 1.15.0)
143-
railties (= 6.1.3.2)
144-
sprockets-rails (>= 2.0.0)
166+
railties (= 7.0.1)
145167
rails-dom-testing (2.0.3)
146168
activesupport (>= 4.2.0)
147169
nokogiri (>= 1.6)
148170
rails-html-sanitizer (1.4.2)
149171
loofah (~> 2.3)
150-
railties (6.1.3.2)
151-
actionpack (= 6.1.3.2)
152-
activesupport (= 6.1.3.2)
172+
railties (7.0.1)
173+
actionpack (= 7.0.1)
174+
activesupport (= 7.0.1)
153175
method_source
154-
rake (>= 0.8.7)
176+
rake (>= 12.2)
155177
thor (~> 1.0)
178+
zeitwerk (~> 2.5)
156179
rake (13.0.6)
157180
regexp_parser (2.1.1)
158181
rexml (3.2.5)
@@ -184,14 +207,9 @@ GEM
184207
simplecov_json_formatter (~> 0.1)
185208
simplecov-html (0.12.3)
186209
simplecov_json_formatter (0.1.3)
187-
sprockets (4.0.2)
188-
concurrent-ruby (~> 1.0)
189-
rack (> 1, < 3)
190-
sprockets-rails (3.2.2)
191-
actionpack (>= 4.0)
192-
activesupport (>= 4.0)
193-
sprockets (>= 3.0.0)
210+
strscan (3.0.1)
194211
thor (1.2.1)
212+
timeout (0.2.0)
195213
tzinfo (2.0.4)
196214
concurrent-ruby (~> 1.0)
197215
webmock (3.13.0)
@@ -203,12 +221,12 @@ GEM
203221
rack-proxy (>= 0.6.1)
204222
railties (>= 5.2)
205223
semantic_range (>= 2.3.0)
206-
websocket-driver (0.7.3)
224+
websocket-driver (0.7.5)
207225
websocket-extensions (>= 0.1.0)
208226
websocket-extensions (0.1.5)
209227
xpath (3.2.0)
210228
nokogiri (~> 1.8)
211-
zeitwerk (2.5.3)
229+
zeitwerk (2.5.4)
212230

213231
PLATFORMS
214232
ruby
@@ -222,6 +240,7 @@ DEPENDENCIES
222240
pry-byebug
223241
pry-rails
224242
puma
243+
rails (= 7.0.1)
225244
rspec-rails (~> 4.0.2)
226245
selenium-webdriver
227246
simplecov

‎ci/Dockerfile.test_7_0_ruby_3_0

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
FROM ruby:3.0-alpine3.12
2+
3+
RUN gem install bundler:2.1.4
4+
5+
RUN apk update --no-cache && \
6+
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev shared-mime-info npm && \
7+
mkdir -p /app
8+
9+
WORKDIR /app
10+
11+
COPY ./lib/ /app/lib/
12+
COPY matestack-ui-core.gemspec /app/
13+
COPY ./ci/Gemfile.7.0 /app/Gemfile
14+
RUN bundle install
15+
16+
COPY package.json /app/
17+
RUN yarn install
18+
19+
RUN apk update && apk upgrade \
20+
&& echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
21+
&& echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
22+
&& apk add --no-cache \
23+
chromium=86.0.4240.111-r0 \
24+
nss@edge \
25+
&& rm -rf /var/lib/apt/lists/* \
26+
/var/cache/apk/* \
27+
/usr/share/man \
28+
/tmp/*
29+
30+
RUN apk add chromium-chromedriver=86.0.4240.111-r0
31+
32+
ENV CHROME_BIN=/usr/bin/chromium-browser \
33+
CHROME_PATH=/usr/lib/chromium/
34+
35+
RUN mv Gemfile _Gemfile
36+
RUN mv Gemfile.lock _Gemfile.lock
37+
RUN mv yarn.lock _yarn.lock
38+
COPY . /app
39+
RUN rm Gemfile
40+
RUN rm Gemfile.lock
41+
RUN rm yarn.lock
42+
RUN mv _Gemfile Gemfile
43+
RUN mv _Gemfile.lock Gemfile.lock
44+
RUN mv _yarn.lock yarn.lock
45+
46+
WORKDIR /app/spec/dummy
47+
48+
RUN npm install
49+
RUN ./bin/webpack
50+
51+
RUN rm ./db/schema.rb
52+
53+
RUN rm ./config/application.rb
54+
RUN mv ./config/application.7.0_rb /app/spec/dummy/config/application.rb
55+
56+
WORKDIR /app

‎ci/Gemfile.5.2

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ gemspec
1313

1414
gem 'rails', '5.2.4.4'
1515

16-
gem "trailblazer-cells"
17-
gem "cells-rails"
18-
gem "cells-haml"
19-
2016
group :development, :test do
2117
gem 'rspec-rails', '~> 3.8'
2218
gem 'capybara'

‎ci/Gemfile.6.0

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ gemspec
1313

1414
gem 'rails', '6.0.3.4'
1515

16-
gem "trailblazer-cells"
17-
gem "cells-rails"
18-
gem "cells-haml"
19-
2016
group :development, :test do
2117
gem 'rspec-rails', '~> 3.8'
2218
gem 'capybara'

‎ci/Gemfile.6.1

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ gemspec
1313

1414
gem 'rails', '6.1.1'
1515

16-
gem "trailblazer-cells"
17-
gem "cells-rails"
18-
gem "cells-haml"
19-
2016
group :development, :test do
2117
gem 'rspec-rails', '~> 4.0.2'
2218
gem 'capybara'

0 commit comments

Comments
 (0)