From 3f0c167f4ca9908218f415498b4b1d11755c9137 Mon Sep 17 00:00:00 2001
From: Loic Nageleisen <loic.nageleisen@datadoghq.com>
Date: Fri, 28 Jun 2024 16:07:37 +0200
Subject: [PATCH] Fold appraisal and bundle step together

---
 .github/workflows/unit-test-appraisal.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/unit-test-appraisal.yml b/.github/workflows/unit-test-appraisal.yml
index e9488515038..36c702aeb02 100644
--- a/.github/workflows/unit-test-appraisal.yml
+++ b/.github/workflows/unit-test-appraisal.yml
@@ -40,18 +40,18 @@ jobs:
       - uses: actions/checkout@v4
       - name: Bundle install
         run: bundle install
-      - name: Appraisal install
-        id: appraisal
-        if: ${{ matrix.appraisal }}
+      - name: Bundle install
+        id: bundle
         run: |
-          BUNDLE_GEMFILE="gemfiles/${{ matrix.engine.name }}_${{ matrix.engine.version }}_$(echo ${{ matrix.appraisal }} | tr '-' '_').gemfile"
+          if [ -n "${{ matrix.appraisal }}" ]; then
+            BUNDLE_GEMFILE="gemfiles/${{ matrix.engine.name }}_${{ matrix.engine.version }}_$(echo ${{ matrix.appraisal }} | tr '-' '_').gemfile"
+          elif [ "${{ matrix.engine }}" = "ruby" ]; then
+            BUNDLE_GEMFILE="Gemfile-${{ matrix.engine.version }}"
+          else
+            BUNDLE_GEMFILE="Gemfile-${{ matrix.engine.name }}-${{ matrix.engine.version }}"
+          fi
           echo "BUNDLE_GEMFILE=${BUNDLE_GEMFILE}" >> $GITHUB_OUTPUT
-          export BUNDLE_GEMFILE
-          bundle install
+          env BUNDLE_GEMFILE="${BUNDLE_GEMFILE}" bundle install
       - name: Run the test
         run: |
-          if [ -n "${{ steps.appraisal.outputs.BUNDLE_GEMFILE }}" ]; then
-            BUNDLE_GEMFILE="${{ steps.appraisal.outputs.BUNDLE_GEMFILE }}"
-            export BUNDLE_GEMFILE
-          fi
-          bundle exec rake spec:${{ matrix.spec }}
+          env BUNDLE_GEMFILE="${{ steps.bundle.outputs.BUNDLE_GEMFILE }}" bundle exec rake spec:${{ matrix.spec }}