From 90f96eafe87ee0e47ac1c9fa8f0b37b0fbbb0b0a Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Mon, 12 Apr 2021 19:05:13 +0300
Subject: [PATCH] Pull request: all: try reenabling newer github cache action

Merge in DNS/adguard-home from gh-cache to master

Squashed commit of the following:

commit 0134aa2f6f3892064572222819214c2185b1ac58
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 18:38:23 2021 +0300

    all: try reenabling newer github cache action
---
 .github/workflows/build.yml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 95f2c35e..6aa7d2d9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,9 +39,7 @@
       'with':
         'node-version': '${{ env.NODE_VERSION }}'
     - 'name': 'Set up Go modules 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'
+      'uses': 'actions/cache@v2'
       'with':
         'path': '~/go/pkg/mod'
         'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
@@ -50,9 +48,7 @@
       'id': 'npm-cache'
       'run': 'echo "::set-output name=dir::$(npm config get cache)"'
     - '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'
+      'uses': 'actions/cache@v2'
       'with':
         'path': '${{ steps.npm-cache.outputs.dir }}'
         'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"
@@ -83,9 +79,7 @@
       'with':
         'node-version': '${{ env.NODE_VERSION }}'
     - 'name': 'Set up Go modules 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'
+      'uses': 'actions/cache@v2'
       'with':
         'path': '~/go/pkg/mod'
         'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
@@ -94,9 +88,7 @@
       'id': 'npm-cache'
       'run': 'echo "::set-output name=dir::$(npm config get cache)"'
     - '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'
+      'uses': 'actions/cache@v2'
       'with':
         'path': '${{ steps.npm-cache.outputs.dir }}'
         'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"