From 40ebe0088bc97f644889d915b0524b49d4a21e4c Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Fri, 19 Nov 2021 20:17:56 +0100
Subject: build: upgrade to yarn 3

Also upgrades various frontend dependencies.

We can't upgrade to typescript 4.5 yet, because
https://github.com/yarnpkg/berry/pull/3760 is not released yet.
---
 .github/workflows/build.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1fa16a43..5c2893a9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,9 +23,7 @@ jobs:
         with:
           path: |
             ~/.gradle/caches
-            .gradle/node
-            .gradle/yarn
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', 'gradle.properties', 'gradle/libs.versions.toml', 'gradle/wrapper/gradle-wrapper.properties') }}
           restore-keys: ${{ runner.os }}-gradle
       - name: Cache Sonar packages
         uses: actions/cache@v2
@@ -37,7 +35,14 @@ jobs:
         uses: actions/cache@v2
         with:
           path: |
-            **/node_modules
+            **/.node
+          key: ${{ runner.os }}-node-${{ hashFiles('gradle.properties') }}
+          restore-keys: ${{ runner.os }}-node
+      - name: Cache yarn packages
+        uses: actions/cache@v2
+        with:
+          path: |
+            **/.yarn/cache
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: ${{ runner.os }}-yarn
       - name: Gradle build and Sonar analyze
-- 
cgit v1.2.3-54-g00ecf