build: 更新 cache key & 修复变量引用

This commit is contained in:
BugKing 2020-12-03 17:34:01 +08:00
parent c8eda48a23
commit 71d11f0fb7
1 changed files with 3 additions and 5 deletions

View File

@ -16,7 +16,6 @@ jobs:
env: env:
cache-name: cache-node-modules cache-name: cache-node-modules
with: with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: | restore-keys: |
@ -29,11 +28,10 @@ jobs:
env: env:
cache-name: cache-maven-deps cache-name: cache-maven-deps
with: with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.m2 path: ~/.m2
key: ${{ runner.os }}-build-${{ env.cache-name }} key: ${{ runner.os }}-build-${{ env.cache-name }}
restore-keys: | restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build-${{ env.cache-name }}
${{ runner.os }}-build- ${{ runner.os }}-build-
${{ runner.os }}- ${{ runner.os }}-
@ -59,5 +57,5 @@ jobs:
- name: Build Docker Image - name: Build Docker Image
uses: docker/build-push-action@v2.2.0 uses: docker/build-push-action@v2.2.0
with: with:
build-args: MS_VERSION=${BRANCH_NAME}-b${GITHUB_RUN_NUMBER} build-args: MS_VERSION=${{ env.BRANCH_NAME }}-b${{ env.GITHUB_RUN_NUMBER }}
tags: metersphere/metersphere:${BRANCH_NAME} tags: metersphere/metersphere:${{ env.BRANCH_NAME }}