fix dva3221-7.1.0-42661

jackey619 · Apr 10, 2022 · a477832 · a477832
1 parent c487e7f
commit a477832
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -63,12 +63,13 @@ jobs:
         uses: actions/checkout@v2
 
       - name: 缓存加速
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             cache/*.pat
             docker/downloads/*.txz
           key: ${{matrix.platform}}-${{matrix.version}}-${{ hashFiles('global_config.json') }}
+          restore-keys: ${{matrix.platform}}-${{matrix.version}}-
 
       - name: 准备构建环境
         run: |

diff --git a/docker/helper.sh b/docker/helper.sh
@@ -166,7 +166,7 @@ brp_repack_tar()
   pr_process "Repacking %s file form %s" "${2}" "${1}"
 
   local output;
-  output=$(tar -czf "${2}" -C "${1}" . 2>&1)
+  output=$("${TAR_PATH}" -czf "${2}" -C "${1}" . 2>&1)
   if [ $? -ne 0 ]; then
     pr_process_err
 

diff --git a/global_config.json b/global_config.json
@@ -426,6 +426,7 @@
     },
     {
       "id": "dva3221-7.1.0-42661",
+      "platform_name": "DVA3221",
       "platform_version": "denverton-7.1.0-42661",
       "user_config_json": "dva3221_user_config.json",
       "docker_base_image": "debian:10-slim",