From 55bde69691ec3d63abac1f41828d58f90ccbf583 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Mon, 8 Feb 2021 12:58:35 +0300
Subject: [PATCH] Pull request: all: fix gh cache action version

Merge in DNS/adguard-home from fix-cache-action to master

Squashed commit of the following:

commit d0bd209566e8385813a2a233b453f25495752398
Merge: 38761671 00700c13
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Feb 8 12:47:59 2021 +0300

    Merge branch 'master' into fix-cache-action

commit 3876167155d6100342b9bf020663ebb5fd90b7de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Feb 5 20:36:33 2021 +0300

    all: don't build frontend twice

commit f3a628dbafb5e8c0375e5c7b19e72a7c4d136f44
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Feb 5 20:23:14 2021 +0300

    all: more fix

commit 89ff42a271dc49d2c4de88db9ba39105558e1468
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Feb 5 20:17:55 2021 +0300

    all: fix gh cache action version
---
 .github/workflows/build.yml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0bf8807b..4df5b455 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,7 +39,9 @@
       'with':
         'node-version': '${{ env.NODE_VERSION }}'
     - 'name': 'Set up Go modules cache'
-      'uses': 'actions/cache@v2'
+      # TODO(a.garipov): Update when they fix the macOS issue.  The issue is
+      # most probably https://github.com/actions/cache/issues/527.
+      'uses': 'actions/cache@v2.1.3'
       'with':
         'path': '~/go/pkg/mod'
         'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
@@ -48,7 +50,9 @@
       'id': 'npm-cache'
       'run': 'echo "::set-output name=dir::$(npm config get cache)"'
     - 'name': 'Set up npm cache'
-      'uses': 'actions/cache@v2'
+      # TODO(a.garipov): Update when they fix the macOS issue.  The issue is
+      # most probably https://github.com/actions/cache/issues/527.
+      'uses': 'actions/cache@v2.1.3'
       'with':
         'path': '${{ steps.npm-cache.outputs.dir }}'
         'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"
@@ -79,7 +83,9 @@
       'with':
         'node-version': '${{ env.NODE_VERSION }}'
     - 'name': 'Set up Go modules cache'
-      'uses': 'actions/cache@v2'
+      # TODO(a.garipov): Update when they fix the macOS issue.  The issue is
+      # most probably https://github.com/actions/cache/issues/527.
+      'uses': 'actions/cache@v2.1.3'
       'with':
         'path': '~/go/pkg/mod'
         'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
@@ -87,8 +93,10 @@
     - 'name': 'Get npm cache directory'
       'id': 'npm-cache'
       'run': 'echo "::set-output name=dir::$(npm config get cache)"'
-    - 'name': 'Set up node_modules cache'
-      'uses': 'actions/cache@v2'
+    - 'name': 'Set up npm cache'
+      # TODO(a.garipov): Update when they fix the macOS issue.  The issue is
+      # most probably https://github.com/actions/cache/issues/527.
+      'uses': 'actions/cache@v2.1.3'
       'with':
         'path': '${{ steps.npm-cache.outputs.dir }}'
         'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"
@@ -100,7 +108,7 @@
     - 'name': 'Set up Docker Buildx'
       'uses': 'docker/setup-buildx-action@v1'
     - 'name': 'Run snapshot build'
-      'run': 'make SIGN=0 VERBOSE=1 js-deps js-build build-release build-docker'
+      'run': 'make SIGN=0 VERBOSE=1 build-release build-docker'
 
   'notify':
     'needs':