From 19b002ff24b988a499cc3829ef2e2a73410228e7 Mon Sep 17 00:00:00 2001
From: Balint Morasz <balint@morasz.hu>
Date: Fri, 27 Oct 2023 12:22:57 +0200
Subject: [PATCH] fix: ci docker build & cache key & --frozen-lockfile

---
 .github/workflows/ci.yml     | 4 ++--
 Kemkas.Web/Kemkas.Web.csproj | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00dcd56..e640754 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,11 +20,11 @@ jobs:
     - name: Cache NPM packages
       uses: actions/cache@v3
       with:
-        key: npm-${{ hashFiles('./frontend/yarn.lock') }}
+        key: npm-${{ hashFiles('./Kemkas.Web/frontend/yarn.lock') }}
         path: |
           ./Kemkas.Web/frontend/node_modules
         restore-keys: |
-          npm-${{ hashFiles('./frontend/yarn.lock') }}  
+          npm-${{ hashFiles('./Kemkas.Web/frontend/yarn.lock') }}  
           npm-
     - name: Yarn Install
       run: |
diff --git a/Kemkas.Web/Kemkas.Web.csproj b/Kemkas.Web/Kemkas.Web.csproj
index b5c2330..31a6b54 100644
--- a/Kemkas.Web/Kemkas.Web.csproj
+++ b/Kemkas.Web/Kemkas.Web.csproj
@@ -50,7 +50,8 @@
 
     <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
         <!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
-        <Exec WorkingDirectory="$(SpaRoot)" Command="yarn install"/>
+        <Exec WorkingDirectory="$(SpaRoot)" Command="yarn install --frozen-lockfile"/>
+        <Exec WorkingDirectory="$(SpaRoot)" Command="bash compile-less.sh"/>
         <Exec WorkingDirectory="$(SpaRoot)" Command="yarn run build"/>
 
         <!-- Include the newly-built files in the publish output -->