Skip to content

Commit fae3ca9

Browse files
mostlyobviousmostlyobvious
committed
Artisanal copy-pastes gone wrong
Long story short: * lack of YML generator for component leads to copy-pasting, with some degree of success and some carrying over useless garbage * matrix for mutant is useless, it is an elaborate way to write something than can be simpler -- makes sense when it is generated if that helps to have less code in generator, not this case now * lean of defaults more, although there's certain value in being explicit with DATABASE_URL etc. -- for now this default will ease transition to self-hosted infra, then hopefully ideal will be reached with more sane approach to produce test YML files
1 parent 7eea8bc commit fae3ca9

22 files changed

+66
-178
lines changed

‎.github/workflows/aggregate_root.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,18 @@ jobs:
4545
runs-on: ubuntu-20.04
4646
env:
4747
WORKING_DIRECTORY: aggregate_root
48-
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
48+
BUNDLE_GEMFILE: Gemfile
4949
strategy:
5050
fail-fast: false
51-
matrix:
52-
include:
53-
- ruby: ruby-3.1
54-
gemfile: Gemfile
5551
steps:
5652
- uses: actions/checkout@v3
5753
with:
5854
fetch-depth: 0
59-
- run: test -e ${{ matrix.gemfile }}.lock
55+
- run: test -e ${{ env.BUNDLE_GEMFILE }}.lock
6056
working-directory: ${{ env.WORKING_DIRECTORY }}
6157
- uses: ruby/setup-ruby@v1
6258
with:
63-
ruby-version: ${{ matrix.ruby }}
59+
ruby-version: ruby-3.1
6460
bundler-cache: true
6561
working-directory: ${{ env.WORKING_DIRECTORY }}
6662
- run: make mutate-changes

‎.github/workflows/minitest-ruby_event_store.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,18 @@ jobs:
4848
runs-on: ubuntu-20.04
4949
env:
5050
WORKING_DIRECTORY: contrib/minitest-ruby_event_store
51-
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
52-
DATABASE_URL: ${{ matrix.database }}
51+
BUNDLE_GEMFILE: Gemfile
5352
strategy:
5453
fail-fast: false
55-
matrix:
56-
include:
57-
- ruby: ruby-3.1
58-
gemfile: Gemfile
5954
steps:
6055
- uses: actions/checkout@v3
6156
with:
6257
fetch-depth: 0
63-
- run: test -e ${{ matrix.gemfile }}.lock
58+
- run: test -e ${{ env.BUNDLE_GEMFILE }}.lock
6459
working-directory: ${{ env.WORKING_DIRECTORY }}
6560
- uses: ruby/setup-ruby@v1
6661
with:
67-
ruby-version: ${{ matrix.ruby }}
62+
ruby-version: ruby-3.1
6863
bundler-cache: true
6964
working-directory: ${{ env.WORKING_DIRECTORY }}
7065
- run: make mutate-changes

‎.github/workflows/minitest-ruby_event_store_coverage.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,18 @@ jobs:
2222
runs-on: ubuntu-20.04
2323
env:
2424
WORKING_DIRECTORY: contrib/minitest-ruby_event_store
25-
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
26-
DATABASE_URL: ${{ matrix.database }}
25+
BUNDLE_GEMFILE: Gemfile
2726
strategy:
2827
fail-fast: false
29-
matrix:
30-
include:
31-
- ruby: ruby-3.1
32-
gemfile: Gemfile
3328
steps:
3429
- uses: actions/checkout@v3
3530
with:
3631
fetch-depth: 0
37-
- run: test -e ${{ matrix.gemfile }}.lock
32+
- run: test -e ${{ env.BUNDLE_GEMFILE }}.lock
3833
working-directory: ${{ env.WORKING_DIRECTORY }}
3934
- uses: ruby/setup-ruby@v1
4035
with:
41-
ruby-version: ${{ matrix.ruby }}
36+
ruby-version: ruby-3.1
4237
bundler-cache: true
4338
working-directory: ${{ env.WORKING_DIRECTORY }}
4439
- run: make mutate

‎.github/workflows/rails_event_store.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,18 @@ jobs:
5353
runs-on: ubuntu-20.04
5454
env:
5555
WORKING_DIRECTORY: rails_event_store
56-
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
56+
BUNDLE_GEMFILE: Gemfile
5757
strategy:
5858
fail-fast: false
59-
matrix:
60-
include:
61-
- ruby: ruby-3.1
62-
gemfile: Gemfile
6359
steps:
6460
- uses: actions/checkout@v3
6561
with:
6662
fetch-depth: 0
67-
- run: test -e ${{ matrix.gemfile }}.lock
63+
- run: test -e ${{ env.BUNDLE_GEMFILE }}.lock
6864
working-directory: ${{ env.WORKING_DIRECTORY }}
6965
- uses: ruby/setup-ruby@v1
7066
with:
71-
ruby-version: ${{ matrix.ruby }}
67+
ruby-version: ruby-3.1
7268
bundler-cache: true
7369
working-directory: ${{ env.WORKING_DIRECTORY }}
7470
- run: make mutate-changes

‎.github/workflows/rails_event_store_active_record.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,24 +126,18 @@ jobs:
126126
runs-on: ubuntu-20.04
127127
env:
128128
WORKING_DIRECTORY: rails_event_store_active_record
129-
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
130-
DATABASE_URL: ${{ matrix.database }}
129+
BUNDLE_GEMFILE: Gemfile
131130
strategy:
132131
fail-fast: false
133-
matrix:
134-
include:
135-
- ruby: ruby-3.1
136-
gemfile: Gemfile
137-
database: "sqlite3::memory:"
138132
steps:
139133
- uses: actions/checkout@v3
140134
with:
141135
fetch-depth: 0
142-
- run: test -e ${{ matrix.gemfile }}.lock
136+
- run: test -e ${{ env.BUNDLE_GEMFILE }}.lock
143137
working-directory: ${{ env.WORKING_DIRECTORY }}
144138
- uses: ruby/setup-ruby@v1
145139
with:
146-
ruby-version: ${{ matrix.ruby }}
140+
ruby-version: ruby-3.1
147141
bundler-cache: true
148142
working-directory: ${{ env.WORKING_DIRECTORY }}
149143
- run: make mutate-changes

‎.github/workflows/ruby_event_store-browser.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,18 @@ jobs:
5252
runs-on: ubuntu-20.04
5353
env:
5454
WORKING_DIRECTORY: ruby_event_store-browser
55-
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
55+
BUNDLE_GEMFILE: Gemfile
5656
strategy:
5757
fail-fast: false
58-
matrix:
59-
include:
60-
- ruby: ruby-3.1
61-
gemfile: Gemfile
6258
steps:
6359
- uses: actions/checkout@v3
6460
with:
6561
fetch-depth: 0
66-
- run: test -e ${{ matrix.gemfile }}.lock
62+
- run: test -e ${{ env.BUNDLE_GEMFILE }}.lock
6763
working-directory: ${{ env.WORKING_DIRECTORY }}
6864
- uses: ruby/setup-ruby@v1
6965
with:
70-
ruby-version: ${{ matrix.ruby }}
66+
ruby-version: ruby-3.1
7167
bundler-cache: true
7268
working-directory: ${{ env.WORKING_DIRECTORY }}
7369
- run: make mutate-changes

‎.github/workflows/ruby_event_store-flipper.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,18 @@ jobs:
5555
runs-on: ubuntu-20.04
5656
env:
5757
WORKING_DIRECTORY: contrib/ruby_event_store-flipper
58-
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
58+
BUNDLE_GEMFILE: Gemfile
5959
strategy:
6060
fail-fast: false
61-
matrix:
62-
include:
63-
- ruby: ruby-3.1
64-
gemfile: Gemfile
6561
steps:
6662
- uses: actions/checkout@v3
6763
with:
6864
fetch-depth: 0
69-
- run: test -e ${{ matrix.gemfile }}.lock
65+
- run: test -e ${{ env.BUNDLE_GEMFILE }}.lock
7066
working-directory: ${{ env.WORKING_DIRECTORY }}
7167
- uses: ruby/setup-ruby@v1
7268
with:
73-
ruby-version: ${{ matrix.ruby }}
69+
ruby-version: ruby-3.1
7470
bundler-cache: true
7571
working-directory: ${{ env.WORKING_DIRECTORY }}
7672
- run: make mutate-changes

‎.github/workflows/ruby_event_store-newrelic.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,18 @@ jobs:
4848
runs-on: ubuntu-20.04
4949
env:
5050
WORKING_DIRECTORY: contrib/ruby_event_store-newrelic
51-
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
52-
DATABASE_URL: ${{ matrix.database }}
51+
BUNDLE_GEMFILE: Gemfile
5352
strategy:
5453
fail-fast: false
55-
matrix:
56-
include:
57-
- ruby: ruby-3.1
58-
gemfile: Gemfile
5954
steps:
6055
- uses: actions/checkout@v3
6156
with:
6257
fetch-depth: 0
63-
- run: test -e ${{ matrix.gemfile }}.lock
58+
- run: test -e ${{ env.BUNDLE_GEMFILE }}.lock
6459
working-directory: ${{ env.WORKING_DIRECTORY }}
6560
- uses: ruby/setup-ruby@v1
6661
with:
67-
ruby-version: ${{ matrix.ruby }}
62+
ruby-version: ruby-3.1
6863
bundler-cache: true
6964
working-directory: ${{ env.WORKING_DIRECTORY }}
7065
- run: make mutate-changes

‎.github/workflows/ruby_event_store-newrelic_coverage.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,18 @@ jobs:
2222
runs-on: ubuntu-20.04
2323
env:
2424
WORKING_DIRECTORY: contrib/ruby_event_store-newrelic
25-
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
26-
DATABASE_URL: ${{ matrix.database }}
25+
BUNDLE_GEMFILE: Gemfile
2726
strategy:
2827
fail-fast: false
29-
matrix:
30-
include:
31-
- ruby: ruby-3.1
32-
gemfile: Gemfile
3328
steps:
3429
- uses: actions/checkout@v3
3530
with:
3631
fetch-depth: 0
37-
- run: test -e ${{ matrix.gemfile }}.lock
32+
- run: test -e ${{ env.BUNDLE_GEMFILE }}.lock
3833
working-directory: ${{ env.WORKING_DIRECTORY }}
3934
- uses: ruby/setup-ruby@v1
4035
with:
41-
ruby-version: ${{ matrix.ruby }}
36+
ruby-version: ruby-3.1
4237
bundler-cache: true
4338
working-directory: ${{ env.WORKING_DIRECTORY }}
4439
- run: make mutate

‎.github/workflows/ruby_event_store-outbox.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ jobs:
104104
runs-on: ubuntu-20.04
105105
env:
106106
WORKING_DIRECTORY: contrib/ruby_event_store-outbox
107-
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
108-
DATABASE_URL: ${{ matrix.database }}
107+
BUNDLE_GEMFILE: Gemfile
109108
REDIS_URL: redis://localhost:6379/0
110109
services:
111110
redis:
@@ -114,20 +113,15 @@ jobs:
114113
- 6379:6379
115114
strategy:
116115
fail-fast: false
117-
matrix:
118-
include:
119-
- ruby: ruby-3.1
120-
gemfile: Gemfile
121-
database: "sqlite3::memory:"
122116
steps:
123117
- uses: actions/checkout@v3
124118
with:
125119
fetch-depth: 0
126-
- run: test -e ${{ matrix.gemfile }}.lock
120+
- run: test -e ${{ env.BUNDLE_GEMFILE }}.lock
127121
working-directory: ${{ env.WORKING_DIRECTORY }}
128122
- uses: ruby/setup-ruby@v1
129123
with:
130-
ruby-version: ${{ matrix.ruby }}
124+
ruby-version: ruby-3.1
131125
bundler-cache: true
132126
working-directory: ${{ env.WORKING_DIRECTORY }}
133127
- run: make mutate-changes

0 commit comments

Comments
 (0)