Perhaps an include is actually the way to go...

jsgoldstein · Sep 28, 2023 · 50ae282 · 50ae282
1 parent 45ea4bf
commit 50ae282
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
@@ -254,7 +254,6 @@ jobs:
   test-search:
     name: Testing search
     runs-on: ubuntu-latest
-    if: ${{ matrix.ruby-version}} == .ruby-version || ${{ matrix.search-image}} == docker.elastic.co/elasticsearch/elasticsearch:7.17.13
 
     needs:
       - build
@@ -314,10 +313,12 @@ jobs:
           - '3.0'
           - '3.1'
           - '.ruby-version'
-        search-image:
-          - docker.elastic.co/elasticsearch/elasticsearch:7.17.13
-          - docker.elastic.co/elasticsearch/elasticsearch:8.10.2
-          - opensearchproject/opensearch:2
+        include:
+          - search-image: docker.elastic.co/elasticsearch/elasticsearch:7.17.13
+          - ruby-version: '.ruby-version'
+            search-image: docker.elastic.co/elasticsearch/elasticsearch:8.10.2
+          - ruby-version: '.ruby-version'
+            search-image: opensearchproject/opensearch:2
 
     steps:
       - uses: actions/checkout@v4