From ff04bc2adb69707f19a3fca526bb2ddbb0b3e29e Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Tue, 10 Sep 2024 14:21:10 -0700
Subject: [PATCH] update ci config

---
 .github/workflows/build_and_deploy.yml | 2 +-
 .github/workflows/build_and_test.yml   | 2 +-
 scripts/pull-turbo-cache.js            | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index 80a48b3654091..e086d8f5aa141 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -281,7 +281,7 @@ jobs:
       # issues with turbo caching
       - name: pull build cache
         if: ${{ matrix.settings.docker }}
-        run: node ./scripts/pull-turbo-cache.js ${{ matrix.settings.target }}
+        run: npm i -g turbo@${{ env.TURBO_VERSION }} && node ./scripts/pull-turbo-cache.js ${{ matrix.settings.target }}
 
       - name: check build exists
         if: ${{ matrix.settings.docker }}
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 1f4d50d639ed3..387dc49f791db 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -2,7 +2,7 @@ name: build-and-test
 
 on:
   push:
-    branches: ['canary']
+    branches: ['canary', 'next-13']
   pull_request:
     types: [opened, synchronize]
 
diff --git a/scripts/pull-turbo-cache.js b/scripts/pull-turbo-cache.js
index 919618a347f61..9a49d845956c6 100644
--- a/scripts/pull-turbo-cache.js
+++ b/scripts/pull-turbo-cache.js
@@ -17,7 +17,12 @@ const { spawn } = require('child_process')
       }
     )
 
+    child.stderr.on('data', (data) => {
+      process.stderr.write(data)
+    })
+
     child.stdout.on('data', (data) => {
+      process.stdout.write(data)
       turboResult += data.toString()
     })
 
@@ -42,6 +47,7 @@ const { spawn } = require('child_process')
 
   // pull cache if it was available
   if (task.cache.local || task.cache.remote) {
+    console.log('Cache Status', task.taskId, task.hash, task.cache)
     await new Promise((resolve, reject) => {
       const child = spawn(
         '/bin/bash',