Make env variable from each matrix key automatically

Renamed a few of them to follow convention.
RailsEventStore · Sep 6, 2023 · 0ecd590 · 0ecd590
1 parent f6392ba
commit 0ecd590
Show file tree

Hide file tree

Showing 30 changed files with 158 additions and 99 deletions.
diff --git a/.github/workflows/aggregate_root.yml b/.github/workflows/aggregate_root.yml
@@ -18,7 +18,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: aggregate_root
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
       matrix:
@@ -49,7 +50,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: aggregate_root
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/dres_client.yml b/.github/workflows/dres_client.yml
@@ -24,7 +24,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/dres_client
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/dres_rails.yml b/.github/workflows/dres_rails.yml
@@ -24,8 +24,10 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/dres_rails
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
-      DATABASE_URL: ${{ matrix.database_url }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      DATABASE_URL: "${{ matrix.database_url }}"
+      DATA_TYPE: "${{ matrix.data_type }}"
     services:
       postgres_11:
         image: postgres:11

diff --git a/.github/workflows/minitest-ruby_event_store.yml b/.github/workflows/minitest-ruby_event_store.yml
@@ -20,7 +20,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/minitest-ruby_event_store
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
       matrix:
@@ -47,7 +48,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/minitest-ruby_event_store
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/rails_event_store.yml b/.github/workflows/rails_event_store.yml
@@ -18,7 +18,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: rails_event_store
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
       matrix:
@@ -53,7 +54,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: rails_event_store
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store-active_record.yml b/.github/workflows/ruby_event_store-active_record.yml
@@ -18,9 +18,10 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: ruby_event_store-active_record
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
-      DATABASE_URL: ${{ matrix.database_url }}
-      DATA_TYPE: ${{ matrix.data_type }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      DATABASE_URL: "${{ matrix.database_url }}"
+      DATA_TYPE: "${{ matrix.data_type }}"
     services:
       postgres_11:
         image: postgres:11
@@ -122,7 +123,10 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: ruby_event_store-active_record
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      DATABASE_URL: "${{ matrix.database_url }}"
+      DATA_TYPE: "${{ matrix.data_type }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store-browser.yml b/.github/workflows/ruby_event_store-browser.yml
@@ -18,7 +18,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: ruby_event_store-browser
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
       matrix:
@@ -60,7 +61,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: ruby_event_store-browser
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store-flipper.yml b/.github/workflows/ruby_event_store-flipper.yml
@@ -20,7 +20,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-flipper
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
       matrix:
@@ -53,7 +54,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-flipper
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store-newrelic.yml b/.github/workflows/ruby_event_store-newrelic.yml
@@ -20,7 +20,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-newrelic
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
       matrix:
@@ -49,7 +50,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-newrelic
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store-outbox.yml b/.github/workflows/ruby_event_store-outbox.yml
@@ -20,8 +20,9 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-outbox
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
-      DATABASE_URL: ${{ matrix.database_url }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      DATABASE_URL: "${{ matrix.database_url }}"
     services:
       mysql_5:
         image: mysql:5
@@ -104,7 +105,9 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-outbox
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      DATABASE_URL: "${{ matrix.database_url }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store-profiler.yml b/.github/workflows/ruby_event_store-profiler.yml
@@ -20,7 +20,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-profiler
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
       matrix:
@@ -49,7 +50,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-profiler
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store-protobuf.yml b/.github/workflows/ruby_event_store-protobuf.yml
@@ -20,8 +20,9 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-protobuf
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
-      DATABASE_URL: ${{ matrix.database_url }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      DATABASE_URL: "${{ matrix.database_url }}"
     strategy:
       fail-fast: false
       matrix:
@@ -63,7 +64,9 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-protobuf
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      DATABASE_URL: "${{ matrix.database_url }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store-rom.yml b/.github/workflows/ruby_event_store-rom.yml
@@ -20,9 +20,10 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-rom
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
-      DATABASE_URL: ${{ matrix.database_url }}
-      DATA_TYPE: ${{ matrix.data_type }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      DATABASE_URL: "${{ matrix.database_url }}"
+      DATA_TYPE: "${{ matrix.data_type }}"
     services:
       postgres_11:
         image: postgres:11
@@ -112,7 +113,10 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-rom
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      DATABASE_URL: "${{ matrix.database_url }}"
+      DATA_TYPE: "${{ matrix.data_type }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store-rspec.yml b/.github/workflows/ruby_event_store-rspec.yml
@@ -18,7 +18,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: ruby_event_store-rspec
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
       matrix:
@@ -49,7 +50,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: ruby_event_store-rspec
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store-sequel.yml b/.github/workflows/ruby_event_store-sequel.yml
@@ -20,9 +20,10 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-sequel
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
-      DATABASE_URL: ${{ matrix.database_url }}
-      DATA_TYPE: ${{ matrix.data_type }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      DATABASE_URL: "${{ matrix.database_url }}"
+      DATA_TYPE: "${{ matrix.data_type }}"
     services:
       postgres_11:
         image: postgres:11
@@ -112,7 +113,10 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-sequel
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      DATABASE_URL: "${{ matrix.database_url }}"
+      DATA_TYPE: "${{ matrix.data_type }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store-sidekiq_scheduler.yml b/.github/workflows/ruby_event_store-sidekiq_scheduler.yml
@@ -20,22 +20,28 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-sidekiq_scheduler
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
-      REDIS_URL: redis://localhost:6379/0
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      REDIS_URL: "${{ matrix.redis_url }}"
     strategy:
       fail-fast: false
       matrix:
         include:
           - ruby_version: ruby-3.1
             bundle_gemfile: Gemfile
+            redis_url: redis://localhost:6379/0
           - ruby_version: ruby-3.0
             bundle_gemfile: Gemfile
+            redis_url: redis://localhost:6379/0
           - ruby_version: ruby-2.7
             bundle_gemfile: Gemfile
+            redis_url: redis://localhost:6379/0
           - ruby_version: ruby-3.1
             bundle_gemfile: Gemfile.sidekiq_6_5
+            redis_url: redis://localhost:6379/0
           - ruby_version: ruby-3.1
             bundle_gemfile: Gemfile.sidekiq_5_2
+            redis_url: redis://localhost:6379/0
           - ruby_version: ruby-3.0
             bundle_gemfile: Gemfile.sidekiq_6_5
           - ruby_version: ruby-3.0
@@ -71,8 +77,9 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-sidekiq_scheduler
-      BUNDLE_GEMFILE: Gemfile
-      REDIS_URL: redis://localhost:6379/0
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
+      REDIS_URL: "${{ matrix.redis_url }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store-transformations.yml b/.github/workflows/ruby_event_store-transformations.yml
@@ -20,7 +20,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-transformations
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
       matrix:
@@ -49,7 +50,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: contrib/ruby_event_store-transformations
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/ruby_event_store.yml b/.github/workflows/ruby_event_store.yml
@@ -18,7 +18,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: ruby_event_store
-      BUNDLE_GEMFILE: ${{ matrix.bundle_gemfile }}
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
       matrix:
@@ -49,7 +50,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       WORKING_DIRECTORY: ruby_event_store
-      BUNDLE_GEMFILE: Gemfile
+      RUBY_VERSION: "${{ matrix.ruby_version }}"
+      BUNDLE_GEMFILE: "${{ matrix.bundle_gemfile }}"
     strategy:
       fail-fast: false
     steps:

diff --git a/support/ci/assets.yaml.erb b/support/ci/assets.yaml.erb
@@ -7,7 +7,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     env:
-      WORKING_DIRECTORY: <%= working_directory %>
+      <%= env %>
     strategy:
       fail-fast: false
       matrix: