Remove node from the env cache.

Tencent · Oct 24, 2023 · 806dbe2 · 806dbe2
1 parent ed0d2e7
commit 806dbe2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/autotest.yml b/.github/workflows/autotest.yml
@@ -24,8 +24,6 @@ jobs:
             /usr/local/Cellar/ninja
             /usr/local/Cellar/icu4c
             /usr/local/bin/ninja
-            /usr/local/Cellar/node
-            /usr/local/bin/node
             /usr/local/Cellar/yasm
             /usr/local/bin/yasm
             /usr/local/bin/depsync
@@ -55,7 +53,7 @@ jobs:
             /usr/local/bin/emcc.py
             /usr/local/bin/emcmake.py
             /usr/local/bin/emar.py
-          key: tgfx-environment-macos-20231022
+          key: tgfx-environment-macos-20231024
 
       - name: Get Third-Party Cache
         id: third-party-cache
@@ -107,8 +105,6 @@ jobs:
             /usr/local/Cellar/ninja
             /usr/local/Cellar/icu4c
             /usr/local/bin/ninja
-            /usr/local/Cellar/node
-            /usr/local/bin/node
             /usr/local/Cellar/yasm
             /usr/local/bin/yasm
             /usr/local/bin/depsync
@@ -138,7 +134,7 @@ jobs:
             /usr/local/bin/emcc.py
             /usr/local/bin/emcmake.py
             /usr/local/bin/emar.py
-          key: tgfx-environment-macos-20231022
+          key: tgfx-environment-macos-20231024
 
       - name: Save Third-Party Cache
         if: ${{ (github.event_name == 'push') && (steps.third-party-cache.outputs.cache-hit != 'true') }}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,12 +24,12 @@ jobs:
             /usr/local/Cellar/ninja
             /usr/local/Cellar/icu4c
             /usr/local/bin/ninja
-            /usr/local/Cellar/node
-            /usr/local/bin/node
             /usr/local/Cellar/yasm
             /usr/local/bin/yasm
             /usr/local/bin/depsync
             /usr/local/lib/node_modules/depsync
+            /usr/local/Cellar/gcovr
+            /usr/local/bin/gcovr
             /usr/local/Cellar/emsdk
             /usr/local/Cellar/emsdk/upstream/emscripten
             /usr/local/Cellar/emsdk/node/14.18.2_64bit/bin
@@ -52,8 +52,8 @@ jobs:
             /usr/local/bin/emsymbolizer
             /usr/local/bin/emcc.py
             /usr/local/bin/emcmake.py
-            /usr/local/bin/emar.py            
-          key: tgfx-environment-macos-20231022
+            /usr/local/bin/emar.py
+          key: tgfx-environment-macos-20231024
 
       - name: Get Third-Party Cache
         id: third-party-cache
@@ -99,12 +99,12 @@ jobs:
             /usr/local/Cellar/ninja
             /usr/local/Cellar/icu4c
             /usr/local/bin/ninja
-            /usr/local/Cellar/node
-            /usr/local/bin/node
             /usr/local/Cellar/yasm
             /usr/local/bin/yasm
             /usr/local/bin/depsync
             /usr/local/lib/node_modules/depsync
+            /usr/local/Cellar/gcovr
+            /usr/local/bin/gcovr
             /usr/local/Cellar/emsdk
             /usr/local/Cellar/emsdk/upstream/emscripten
             /usr/local/Cellar/emsdk/node/14.18.2_64bit/bin
@@ -128,7 +128,7 @@ jobs:
             /usr/local/bin/emcc.py
             /usr/local/bin/emcmake.py
             /usr/local/bin/emar.py
-          key: tgfx-environment-macos-20231022
+          key: tgfx-environment-macos-20231024
 
       - name: Save Third-Party Cache
         if: ${{ (github.event_name == 'push') && (steps.third-party-cache.outputs.cache-hit != 'true') }}

diff --git a/sync_deps.sh b/sync_deps.sh
@@ -2,7 +2,7 @@
 cd $(dirname $0)
 
 if [[ `uname` == 'Darwin' ]]; then
-  MAC_REQUIRED_TOOLS="node cmake ninja yasm git-lfs emcc"
+  MAC_REQUIRED_TOOLS="node cmake ninja yasm git-lfs emcc gcovr"
   for TOOL in ${MAC_REQUIRED_TOOLS[@]}; do
   if [ ! $(which $TOOL) ]; then
     if [ ! $(which brew) ]; then