From be2d57253c369f3e3f4ac2a68c1cdefbec5b918b Mon Sep 17 00:00:00 2001
From: Mehul Kar <mehul.kar@vercel.com>
Date: Tue, 28 May 2024 13:15:59 -0500
Subject: [PATCH] run integration and examples with 2.0 also

---
 .github/workflows/test-js-packages.yml |  2 +-
 .github/workflows/turborepo-test.yml   | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-js-packages.yml b/.github/workflows/test-js-packages.yml
index 28c8656b768cd..de7c7b9d1ef23 100644
--- a/.github/workflows/test-js-packages.yml
+++ b/.github/workflows/test-js-packages.yml
@@ -62,7 +62,7 @@ jobs:
       matrix:
         turbo_version:
           - 1.13.4-canary.5
-          - 2.0.0-canary.0
+          - canary # 2.0 canary
         os:
           - name: ubuntu
             runner:
diff --git a/.github/workflows/turborepo-test.yml b/.github/workflows/turborepo-test.yml
index 9317e74322e57..c106a478b91a7 100644
--- a/.github/workflows/turborepo-test.yml
+++ b/.github/workflows/turborepo-test.yml
@@ -176,6 +176,9 @@ jobs:
           - runner: ubuntu-latest
           - runner: macos-12
           - runner: windows-latest
+        turbo_version:
+          - 1.13.4-canary.5
+          - canary # 2.0 canary
     steps:
       # On Windows, set autocrlf to input so that when the repo is cloned down
       # the fixtures retain their line endings and don't get updated to CRLF.
@@ -197,6 +200,8 @@ jobs:
 
       - name: Install Global Turbo
         uses: ./.github/actions/install-global-turbo
+        with:
+          turbo-version: ${{ matrix.turbo_version }}
 
       - name: Setup Graphviz
         uses: ts-graphviz/setup-graphviz@v1
@@ -220,6 +225,12 @@ jobs:
     needs: [determine_jobs]
     if: needs.determine_jobs.outputs.examples == 'true'
     timeout-minutes: 40
+    strategy:
+      fail-fast: false
+      matrix:
+        turbo_version:
+          - 1.13.4-canary.5
+          - canary # 2.0 canary
 
     runs-on: ubuntu-latest
     steps:
@@ -239,13 +250,22 @@ jobs:
 
       - name: Install Global Turbo
         uses: ./.github/actions/install-global-turbo
+        with:
+          turbo-version: ${{ matrix.turbo_version }}
 
       - name: Check examples
         shell: bash
         # Concurrency being 1 is a big hammer here.
         # It's a quick fix for non-deterministic behaviors we're seeing around package resolution.
         # We could likely do some hacking to reparallelize this, but it's not worth it right now.
-        run: turbo run test --filter="@turborepo-examples-tests/*" --continue --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} --env-mode=strict --concurrency=1
+        run: |
+          turbo run test \
+          --filter="@turborepo-examples-tests/*" \
+          --continue \
+          --token=${{ secrets.TURBO_TOKEN }} \
+          --team=${{ vars.TURBO_TEAM }} \
+          --env-mode=strict \
+          --concurrency=1
 
       # Disable corepack again. actions/setup-node's "Post" step runs at the end of
       # this job invokes other package managers, and corepack throws an error.