chore: enable Yarn 4 on CI (#1525)

* chore: enable Yarn 4 on CI (attempt 1) * chore: attempt 2 * chore: attempt 3 * chore: attempt 4 * chore: attempt 5 * chore: fix website * chore: fix attempt 6'
callstack · Nov 13, 2023 · 80e64cf · 80e64cf
1 parent 817d4ed
commit 80e64cf
Show file tree

Hide file tree

Showing 8 changed files with 1,805 additions and 7 deletions.
diff --git a/.github/actions/setup-deps/action.yml b/.github/actions/setup-deps/action.yml
@@ -7,14 +7,19 @@ runs:
     - name: Setup Node.js
       uses: actions/setup-node@v3
       with:
-        node-version: 18
+        node-version-file: .nvmrc
 
     - name: Cache deps
       id: yarn-cache
       uses: actions/cache@v3
       with:
-        path: ./node_modules
-        key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
+        path: |
+          ./node_modules
+          .yarn/install-state.gz
+        key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }}
+        restore-keys: |
+          ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
+          ${{ runner.os }}-yarn-
 
     - name: Install deps
       if: steps.yarn-cache.outputs.cache-hit != 'true'

diff --git a/.github/actions/setup-website-deps/action.yml b/.github/actions/setup-website-deps/action.yml
@@ -7,14 +7,16 @@ runs:
     - name: Setup Node.js
       uses: actions/setup-node@v3
       with:
-        node-version: 18
+        node-version-file: .nvmrc
 
     - name: Cache website deps
       id: yarn-cache-website
       uses: actions/cache@v3
       with:
-        path: ./website/node_modules
-        key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}-website
+        path: |
+          ./website/node_modules
+          ./website/yarn/install-state.gz
+        key: website-${{ runner.os }}-yarn-${{ hashFiles('./website/yarn.lock') }}
 
     - name: Install website deps
       if: steps.yarn-cache-website.outputs.cache-hit != 'true'

diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,3 @@ build
 # Ignore lock files in examples for now
 examples/**/yarn.lock
 .docusaurus
-
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+lts/*
diff --git a/.yarn/releases/yarn-4.0.1.cjs b/.yarn/releases/yarn-4.0.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1 +1,5 @@
+enableGlobalCache: true
+
 nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.0.1.cjs
diff --git a/website/.yarn/releases/yarn-4.0.1.cjs b/website/.yarn/releases/yarn-4.0.1.cjs
diff --git a/website/.yarnrc.yml b/website/.yarnrc.yml
@@ -0,0 +1 @@
+yarnPath: .yarn/releases/yarn-4.0.1.cjs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,3 @@ build
		# Ignore lock files in examples for now
		examples/**/yarn.lock
		.docusaurus