Skip to content

Commit 18eff88

Browse files
committed
fixing ci artifacts
1 parent a9bc73a commit 18eff88

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

.github/workflows/dockerpush.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
with:
1616
name: lockfiles_test_6_1_ruby_3_0
1717
path: |
18-
./ci/yarn.lock
19-
./ci/Gemfile.lock
18+
./ci/artifcats/yarn.lock
19+
./ci/artifacts/Gemfile.lock
2020
test_6_1_ruby_2_7:
2121
runs-on: ubuntu-latest
2222
steps:
@@ -29,8 +29,8 @@ jobs:
2929
with:
3030
name: lockfiles_test_6_1_ruby_2_7
3131
path: |
32-
./ci/yarn.lock
33-
./ci/Gemfile.lock
32+
./ci/artifcats/yarn.lock
33+
./ci/artifacts/Gemfile.lock
3434
test_6_0_ruby_2_6:
3535
runs-on: ubuntu-latest
3636
steps:
@@ -43,8 +43,8 @@ jobs:
4343
with:
4444
name: lockfiles_test_6_0_ruby_2_6
4545
path: |
46-
./ci/yarn.lock
47-
./ci/Gemfile.lock
46+
./ci/artifcats/yarn.lock
47+
./ci/artifacts/Gemfile.lock
4848
test_5_2_ruby_2_6:
4949
runs-on: ubuntu-latest
5050
steps:
@@ -57,5 +57,5 @@ jobs:
5757
with:
5858
name: lockfiles_test_5_2_ruby_2_6
5959
path: |
60-
./ci/yarn.lock
61-
./ci/Gemfile.lock
60+
./ci/artifcats/yarn.lock
61+
./ci/artifacts/Gemfile.lock

ci/artifacts/.keep

Whitespace-only changes.

ci/docker-compose.ci.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ services:
77
dockerfile: ./ci/Dockerfile.test_5_2_ruby_2_6
88
environment:
99
RAILS_ENV: test
10+
volumes:
11+
- "../ci/artifacts:/app/ci/artifacts"
1012
links:
1113
- "postgres_test_5_2_ruby_2_6:postgres_test"
12-
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test && cp Gemfile.lock ./ci/Gemfile.lock && cp yarn.lock ./ci/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 && cp Gemfile.lock ./ci/artifacts/Gemfile.lock && cp yarn.lock ./ci/artifacts/yarn.lock"
1315
user: ${CURRENT_UID}
1416

1517
test_6_0_ruby_2_6:
@@ -18,9 +20,11 @@ services:
1820
dockerfile: ./ci/Dockerfile.test_6_0_ruby_2_6
1921
environment:
2022
RAILS_ENV: test
23+
volumes:
24+
- "../ci/artifacts:/app/ci/artifacts"
2125
links:
2226
- "postgres_test_6_0_ruby_2_6:postgres_test"
23-
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test && cp Gemfile.lock ./ci/Gemfile.lock && cp yarn.lock ./ci/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 && cp Gemfile.lock ./ci/artifacts/Gemfile.lock && cp yarn.lock ./ci/artifacts/yarn.lock"
2428
user: ${CURRENT_UID}
2529

2630
test_6_1_ruby_2_7:
@@ -29,9 +33,11 @@ services:
2933
dockerfile: ./ci/Dockerfile.test_6_1_ruby_2_7
3034
environment:
3135
RAILS_ENV: test
36+
volumes:
37+
- "../ci/artifacts:/app/ci/artifacts"
3238
links:
3339
- "postgres_test_6_1_ruby_2_7:postgres_test"
34-
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test && cp Gemfile.lock ./ci/Gemfile.lock && cp yarn.lock ./ci/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 && cp Gemfile.lock ./ci/artifacts/Gemfile.lock && cp yarn.lock ./ci/artifacts/yarn.lock"
3541
user: ${CURRENT_UID}
3642

3743
test_6_1_ruby_3_0:
@@ -40,9 +46,11 @@ services:
4046
dockerfile: ./ci/Dockerfile.test_6_1_ruby_3_0
4147
environment:
4248
RAILS_ENV: test
49+
volumes:
50+
- "../ci/artifacts:/app/ci/artifacts"
4351
links:
4452
- "postgres_test_6_1_ruby_3_0:postgres_test"
45-
command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test && cp Gemfile.lock ./ci/Gemfile.lock && cp yarn.lock ./ci/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 && cp Gemfile.lock ./ci/artifacts/Gemfile.lock && cp yarn.lock ./ci/artifacts/yarn.lock"
4654
user: ${CURRENT_UID}
4755

4856
postgres_test_base: &postgres_test_base

0 commit comments

Comments
 (0)