Fix FLE tests

tablecheck · Apr 22, 2023 · a9def39 · a9def39
1 parent 10c1fdb
commit a9def39
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
       ${{matrix.gemfile || 'Gemfile'}}
       mongodb-${{matrix.mongodb || '6.0'}}
       ${{matrix.topology || 'server'}}
-      ${{matrix.fle && 'FLE' || ''}}
+      ${{matrix.fle && 'fle=' || ''}}${{matrix.fle || ''}}
       ${{matrix.os || 'ubuntu-20.04'}}"
     env:
       CI: true
@@ -107,27 +107,26 @@ jobs:
             topology: server
 
           # Field-Level Encryption
+          # TODO: support LIBMONGOCRYPT via path
           - ruby: ruby-3.2
             gemfile: gemfiles/rails_7.0.gemfile
             mongodb: '6.0'
             topology: sharded_cluster
-            fle: true
+            fle: helper
           - ruby: ruby-3.1
             gemfile: gemfiles/rails_6.1.gemfile
             mongodb: '6.0'
             topology: replica_set
-            fle: true
+            fle: helper
           - ruby: ruby-2.7
             gemfile: gemfiles/rails_6.0.gemfile
             mongodb: '6.0'
             topology: server
-            fle: true
+            fle: helper
 
     steps:
     - name: repo checkout
-      uses: actions/checkout@v2
-      with:
-        submodules: recursive
+      uses: actions/checkout@v3
     - id: start-mongodb
       name: start mongodb
       uses: mongodb-labs/drivers-evergreen-tools@master
@@ -138,18 +137,20 @@ jobs:
       uses: ruby/setup-ruby@v1
       env:
         BUNDLE_GEMFILE: "${{matrix.gemfile || 'Gemfile'}}"
+        FLE: "${{matrix.fle || ''}}"
       with:
         ruby-version: "${{matrix.ruby}}"
         bundler: 2
     - name: bundle
       run: bundle install --jobs 4 --retry 3
       env:
         BUNDLE_GEMFILE: "${{matrix.gemfile || 'Gemfile'}}"
+        FLE: "${{matrix.fle || ''}}"
     - name: test
       timeout-minutes: 60
       continue-on-error: "${{matrix.experimental || false}}"
       run: bundle exec rake spec
       env:
         BUNDLE_GEMFILE: "${{matrix.gemfile || 'Gemfile'}}"
+        FLE: "${{matrix.fle || ''}}"
         MONGODB_URI: "${{steps.start-mongodb.outputs.cluster-uri}}"
-        FLE: "${{matrix.fle || false}}"