Change Turbo's base branch

RocketChat · Jan 9, 2024 · 6473019 · 6473019
1 parent fa88d15
commit 6473019
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: .turbo
-          key: turbo-${{ runner.os }}-${{ github.job }}
+          key: turbo-${{ runner.os }}-${{ github.sha }}
           restore-keys: |
             turbo-${{ runner.os }}-
       - uses: actions/cache@v3

diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: .turbo
-          key: turbo-${{ runner.os }}-${{ github.job }}
+          key: turbo-${{ runner.os }}-${{ github.sha }}
           restore-keys: |
             turbo-${{ runner.os }}-
       - run: yarn install

diff --git a/turbo.json b/turbo.json
@@ -1,5 +1,5 @@
 {
-  "baseBranch": "origin/master",
+  "baseBranch": "origin/main",
   "pipeline": {
     "build": {
       "dependsOn": ["^build"]