WIP

DataDog · Nov 22, 2024 · d9b99f5 · d9b99f5
1 parent ea88338
commit d9b99f5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -55,18 +55,18 @@ jobs:
         include: "${{ fromJson(needs.compute_tasks.outputs.ruby-33-matrix) }}"
     container:
       image: ghcr.io/datadog/images-rb/engines/ruby:3.3
+      env:
+        BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:
     - uses: actions/checkout@v4
     - name: Configure Git
       run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
     - uses: actions/download-artifact@v4
       with:
         name: bundled-dependencies-${{ github.run_id }}-ruby-33
-    - run: bundle install --local
+    - run: bundle install && bundle exec rake compile_ext
     - name: Test ${{ matrix.task }} with ${{ matrix.gemfile }}
-      env:
-        BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
-      run: bundle install && bundle exec rake spec:${{ matrix.task }}
+      run: bundle exec rake spec:${{ matrix.task }}
   test-ruby-32:
     name: 'ruby-3.2: ${{ matrix.task }} (${{ matrix.group }})'
     needs:
@@ -78,15 +78,15 @@ jobs:
         include: "${{ fromJson(needs.compute_tasks.outputs.ruby-32-matrix) }}"
     container:
       image: ghcr.io/datadog/images-rb/engines/ruby:3.2
+      env:
+        BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:
     - uses: actions/checkout@v4
     - name: Configure Git
       run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
     - uses: actions/download-artifact@v4
       with:
         name: bundled-dependencies-${{ github.run_id }}-ruby-32
-    - run: bundle install --local
+    - run: bundle install && bundle exec rake compile_ext
     - name: Test ${{ matrix.task }} with ${{ matrix.gemfile }}
-      env:
-        BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
-      run: bundle install && bundle exec rake spec:${{ matrix.task }}
+      run: bundle exec rake spec:${{ matrix.task }}
diff --git a/tasks/github.rake b/tasks/github.rake
@@ -41,7 +41,10 @@ namespace :github do
               }
             },
             "container" => {
-              "image" => runtime.image
+              "image" => runtime.image,
+              "env" => {
+                "BUNDLE_GEMFILE" => "${{ matrix.gemfile }}"
+              }
             },
             "steps" => [
               { "uses" => "actions/checkout@v4" },
@@ -55,11 +58,10 @@ namespace :github do
                   "name" => "bundled-dependencies-${{ github.run_id }}-#{runtime.alias}",
                 }
               },
-              { "run" => "bundle install --local" },
+              { "run" => "bundle install && bundle exec rake compile_ext" },
               {
                 "name" => "Test ${{ matrix.task }} with ${{ matrix.gemfile }}",
-                "env" => { "BUNDLE_GEMFILE" => "${{ matrix.gemfile }}" },
-                "run" => "bundle install && bundle exec rake spec:${{ matrix.task }}"
+                "run" => "bundle exec rake spec:${{ matrix.task }}"
               }
             ]
           }