a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Ainar Garipov 2021-04-12 19:05:13 +03:00
parent e671f43a2f
commit 90f96eafe8
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build.yml vendored
View File

@ -39,9 +39,7 @@
'with': 'with':
'node-version': '${{ env.NODE_VERSION }}' 'node-version': '${{ env.NODE_VERSION }}'
- 'name': 'Set up Go modules cache' - 'name': 'Set up Go modules cache'
# TODO(a.garipov): Update when they fix the macOS issue. The issue is 'uses': 'actions/cache@v2'
# most probably https://github.com/actions/cache/issues/527.
'uses': 'actions/cache@v2.1.3'
'with': 'with':
'path': '~/go/pkg/mod' 'path': '~/go/pkg/mod'
'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}" 'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
@ -50,9 +48,7 @@
'id': 'npm-cache' 'id': 'npm-cache'
'run': 'echo "::set-output name=dir::$(npm config get cache)"' 'run': 'echo "::set-output name=dir::$(npm config get cache)"'
- 'name': 'Set up npm cache' - 'name': 'Set up npm cache'
# TODO(a.garipov): Update when they fix the macOS issue. The issue is 'uses': 'actions/cache@v2'
# most probably https://github.com/actions/cache/issues/527.
'uses': 'actions/cache@v2.1.3'
'with': 'with':
'path': '${{ steps.npm-cache.outputs.dir }}' 'path': '${{ steps.npm-cache.outputs.dir }}'
'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}" 'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"
@ -83,9 +79,7 @@
'with': 'with':
'node-version': '${{ env.NODE_VERSION }}' 'node-version': '${{ env.NODE_VERSION }}'
- 'name': 'Set up Go modules cache' - 'name': 'Set up Go modules cache'
# TODO(a.garipov): Update when they fix the macOS issue. The issue is 'uses': 'actions/cache@v2'
# most probably https://github.com/actions/cache/issues/527.
'uses': 'actions/cache@v2.1.3'
'with': 'with':
'path': '~/go/pkg/mod' 'path': '~/go/pkg/mod'
'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}" 'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"
@ -94,9 +88,7 @@
'id': 'npm-cache' 'id': 'npm-cache'
'run': 'echo "::set-output name=dir::$(npm config get cache)"' 'run': 'echo "::set-output name=dir::$(npm config get cache)"'
- 'name': 'Set up npm cache' - 'name': 'Set up npm cache'
# TODO(a.garipov): Update when they fix the macOS issue. The issue is 'uses': 'actions/cache@v2'
# most probably https://github.com/actions/cache/issues/527.
'uses': 'actions/cache@v2.1.3'
'with': 'with':
'path': '${{ steps.npm-cache.outputs.dir }}' 'path': '${{ steps.npm-cache.outputs.dir }}'
'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}" 'key': "${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}"