From bec4c8ff7d8e731151c27c4ea1f3197b88fc19ac Mon Sep 17 00:00:00 2001
From: ReDBrother <bataevdmitriy@gmail.com>
Date: Tue, 13 Feb 2024 01:40:06 +0300
Subject: [PATCH] fix jest actions

---
 .github/workflows/main.yml | 36 ++++++++++++++++++------------------
 package.json               |  3 +++
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index db930ce..7fd4e96 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,22 +23,29 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
 
-      - name: Get yarn cache
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v3
-        id: yarn-cache
+      - name: Setup node
+        uses: actions/setup-node@v4
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          node-version: 20.x
+
+      - name: Yarn cache
+        uses: c-hive/gha-yarn-cache@v2
 
+      # - name: Get yarn cache
+      #   id: yarn-cache-dir-path
+      #   run: echo "::set-output name=dir::$(yarn cache dir)"
+      #
+      # - uses: actions/cache@v4
+      #   id: yarn-cache
+      #   with:
+      #     path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+      #     key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-yarn-
 
       - name: Install yarn dependencies
         run: yarn install --froze-lockfile
@@ -54,8 +61,6 @@ jobs:
       - name: Run jest
         run: yarn test
 
-      # - name: Setup db
-
       - name: Login to Docker Hub
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --pasword-stdin
 
@@ -63,8 +68,3 @@ jobs:
         run: make docker-build-chat-bot
       - name: Push docker image for codebattle bot
         run: make docker-push-chat-bot
-
-      # - name:
-      #   run:
-      #   uses:
-      #   with:
diff --git a/package.json b/package.json
index 81e8a3c..06962fd 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,9 @@
     "prepare": "husky",
     "test": "jest"
   },
+  "jest": {
+    "verbose": true
+  },
   "repository": "git@github.com:hexlet-codebattle/codebattle_bot",
   "author": "ReDBrother <bataevdmitriy@gmail.com>",
   "license": "MIT",