Skip to content

Commit 64ec896

Browse files
jonasjabarijonasjabari
committed
adjusted ci and workflow files to vuejs removal
1 parent 2055c3b commit 64ec896

9 files changed

+5
-46
lines changed

‎.github/workflows/dockerpush.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
with:
1616
name: lockfiles_test_7_0_ruby_3_0
1717
path: |
18-
./ci/artifacts/yarn.lock
1918
./ci/artifacts/Gemfile.lock
2019
test_6_1_ruby_3_0:
2120
runs-on: ubuntu-latest
@@ -29,7 +28,6 @@ jobs:
2928
with:
3029
name: lockfiles_test_6_1_ruby_3_0
3130
path: |
32-
./ci/artifacts/yarn.lock
3331
./ci/artifacts/Gemfile.lock
3432
test_6_1_ruby_2_7:
3533
runs-on: ubuntu-latest
@@ -43,7 +41,6 @@ jobs:
4341
with:
4442
name: lockfiles_test_6_1_ruby_2_7
4543
path: |
46-
./ci/artifacts/yarn.lock
4744
./ci/artifacts/Gemfile.lock
4845
test_6_0_ruby_2_6:
4946
runs-on: ubuntu-latest
@@ -57,7 +54,6 @@ jobs:
5754
with:
5855
name: lockfiles_test_6_0_ruby_2_6
5956
path: |
60-
./ci/artifacts/yarn.lock
6157
./ci/artifacts/Gemfile.lock
6258
test_5_2_ruby_2_6:
6359
runs-on: ubuntu-latest
@@ -71,5 +67,4 @@ jobs:
7167
with:
7268
name: lockfiles_test_5_2_ruby_2_6
7369
path: |
74-
./ci/artifacts/yarn.lock
7570
./ci/artifacts/Gemfile.lock

‎Dockerfile.dev

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,3 @@ COPY ./lib/ /app/lib/
1212
COPY matestack-ui-core.gemspec /app/
1313
COPY Gemfile* /app/
1414
RUN bundle install
15-
16-
COPY package.json yarn* /app/
17-
RUN yarn install

‎Dockerfile.test

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ COPY matestack-ui-core.gemspec /app/
1313
COPY Gemfile* /app/
1414
RUN bundle install
1515

16-
COPY package.json yarn* /app/
17-
RUN yarn install
18-
1916
RUN apk update && apk upgrade \
2017
&& echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
2118
&& echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \

‎ci/Dockerfile.test_5_2_ruby_2_6

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ COPY matestack-ui-core.gemspec /app/
1313
COPY ./ci/Gemfile.5.2 /app/Gemfile
1414
RUN bundle install
1515

16-
COPY package.json /app/
17-
RUN yarn install
18-
1916
RUN apk update && apk upgrade \
2017
&& echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
2118
&& echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
@@ -34,14 +31,11 @@ ENV CHROME_BIN=/usr/bin/chromium-browser \
3431

3532
RUN mv Gemfile _Gemfile
3633
RUN mv Gemfile.lock _Gemfile.lock
37-
RUN mv yarn.lock _yarn.lock
3834
COPY . /app
3935
RUN rm Gemfile
4036
RUN rm Gemfile.lock
41-
RUN rm yarn.lock
4237
RUN mv _Gemfile Gemfile
4338
RUN mv _Gemfile.lock Gemfile.lock
44-
RUN mv _yarn.lock yarn.lock
4539

4640
WORKDIR /app/spec/dummy
4741

‎ci/Dockerfile.test_6_0_ruby_2_6

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ COPY matestack-ui-core.gemspec /app/
1313
COPY ./ci/Gemfile.6.0 /app/Gemfile
1414
RUN bundle install
1515

16-
COPY package.json /app/
17-
RUN yarn install
18-
1916
RUN apk update && apk upgrade \
2017
&& echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
2118
&& echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
@@ -34,14 +31,11 @@ ENV CHROME_BIN=/usr/bin/chromium-browser \
3431

3532
RUN mv Gemfile _Gemfile
3633
RUN mv Gemfile.lock _Gemfile.lock
37-
RUN mv yarn.lock _yarn.lock
3834
COPY . /app
3935
RUN rm Gemfile
4036
RUN rm Gemfile.lock
41-
RUN rm yarn.lock
4237
RUN mv _Gemfile Gemfile
4338
RUN mv _Gemfile.lock Gemfile.lock
44-
RUN mv _yarn.lock yarn.lock
4539

4640
WORKDIR /app/spec/dummy
4741

‎ci/Dockerfile.test_6_1_ruby_2_7

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ COPY matestack-ui-core.gemspec /app/
1313
COPY ./ci/Gemfile.6.1 /app/Gemfile
1414
RUN bundle install
1515

16-
COPY package.json /app/
17-
RUN yarn install
18-
1916
RUN apk update && apk upgrade \
2017
&& echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
2118
&& echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
@@ -34,14 +31,11 @@ ENV CHROME_BIN=/usr/bin/chromium-browser \
3431

3532
RUN mv Gemfile _Gemfile
3633
RUN mv Gemfile.lock _Gemfile.lock
37-
RUN mv yarn.lock _yarn.lock
3834
COPY . /app
3935
RUN rm Gemfile
4036
RUN rm Gemfile.lock
41-
RUN rm yarn.lock
4237
RUN mv _Gemfile Gemfile
4338
RUN mv _Gemfile.lock Gemfile.lock
44-
RUN mv _yarn.lock yarn.lock
4539

4640
WORKDIR /app/spec/dummy
4741

‎ci/Dockerfile.test_6_1_ruby_3_0

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ COPY matestack-ui-core.gemspec /app/
1313
COPY ./ci/Gemfile.6.1 /app/Gemfile
1414
RUN bundle install
1515

16-
COPY package.json /app/
17-
RUN yarn install
18-
1916
RUN apk update && apk upgrade \
2017
&& echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
2118
&& echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
@@ -34,14 +31,11 @@ ENV CHROME_BIN=/usr/bin/chromium-browser \
3431

3532
RUN mv Gemfile _Gemfile
3633
RUN mv Gemfile.lock _Gemfile.lock
37-
RUN mv yarn.lock _yarn.lock
3834
COPY . /app
3935
RUN rm Gemfile
4036
RUN rm Gemfile.lock
41-
RUN rm yarn.lock
4237
RUN mv _Gemfile Gemfile
4338
RUN mv _Gemfile.lock Gemfile.lock
44-
RUN mv _yarn.lock yarn.lock
4539

4640
WORKDIR /app/spec/dummy
4741

‎ci/Dockerfile.test_7_0_ruby_3_0

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ COPY matestack-ui-core.gemspec /app/
1313
COPY ./ci/Gemfile.7.0 /app/Gemfile
1414
RUN bundle install
1515

16-
COPY package.json /app/
17-
RUN yarn install
18-
1916
RUN apk update && apk upgrade \
2017
&& echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
2118
&& echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
@@ -34,14 +31,11 @@ ENV CHROME_BIN=/usr/bin/chromium-browser \
3431

3532
RUN mv Gemfile _Gemfile
3633
RUN mv Gemfile.lock _Gemfile.lock
37-
RUN mv yarn.lock _yarn.lock
3834
COPY . /app
3935
RUN rm Gemfile
4036
RUN rm Gemfile.lock
41-
RUN rm yarn.lock
4237
RUN mv _Gemfile Gemfile
4338
RUN mv _Gemfile.lock Gemfile.lock
44-
RUN mv _yarn.lock yarn.lock
4539

4640
WORKDIR /app/spec/dummy
4741

‎ci/docker-compose.ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
- "../ci/artifacts:/app/ci/artifacts"
1212
links:
1313
- "postgres_test_5_2_ruby_2_6:postgres_test"
14-
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test/core && cp Gemfile.lock ./ci/artifacts/Gemfile.lock && cp yarn.lock ./ci/artifacts/yarn.lock"
14+
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test/core && cp Gemfile.lock ./ci/artifacts/Gemfile.lock"
1515
user: ${CURRENT_UID}
1616

1717
test_6_0_ruby_2_6:
@@ -24,7 +24,7 @@ services:
2424
- "../ci/artifacts:/app/ci/artifacts"
2525
links:
2626
- "postgres_test_6_0_ruby_2_6:postgres_test"
27-
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test/core && cp Gemfile.lock ./ci/artifacts/Gemfile.lock && cp yarn.lock ./ci/artifacts/yarn.lock"
27+
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test/core && cp Gemfile.lock ./ci/artifacts/Gemfile.lock"
2828
user: ${CURRENT_UID}
2929

3030
test_6_1_ruby_2_7:
@@ -37,7 +37,7 @@ services:
3737
- "../ci/artifacts:/app/ci/artifacts"
3838
links:
3939
- "postgres_test_6_1_ruby_2_7:postgres_test"
40-
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test/core && cp Gemfile.lock ./ci/artifacts/Gemfile.lock && cp yarn.lock ./ci/artifacts/yarn.lock"
40+
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test/core && cp Gemfile.lock ./ci/artifacts/Gemfile.lock"
4141
user: ${CURRENT_UID}
4242

4343
test_6_1_ruby_3_0:
@@ -50,7 +50,7 @@ services:
5050
- "../ci/artifacts:/app/ci/artifacts"
5151
links:
5252
- "postgres_test_6_1_ruby_3_0:postgres_test"
53-
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test/core && cp Gemfile.lock ./ci/artifacts/Gemfile.lock && cp yarn.lock ./ci/artifacts/yarn.lock"
53+
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test/core && cp Gemfile.lock ./ci/artifacts/Gemfile.lock"
5454
user: ${CURRENT_UID}
5555

5656
test_7_0_ruby_3_0:
@@ -63,7 +63,7 @@ services:
6363
- "../ci/artifacts:/app/ci/artifacts"
6464
links:
6565
- "postgres_test_7_0_ruby_3_0:postgres_test"
66-
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test/core && cp Gemfile.lock ./ci/artifacts/Gemfile.lock && cp yarn.lock ./ci/artifacts/yarn.lock"
66+
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test/core && cp Gemfile.lock ./ci/artifacts/Gemfile.lock"
6767
user: ${CURRENT_UID}
6868

6969
postgres_test_base: &postgres_test_base

0 commit comments

Comments
 (0)