diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abda0a78b..67a6947d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,14 +81,14 @@ jobs: uses: actions/cache@v4 with: path: node_modules - key: node_modules-${{ hashFiles('package-lock.json') }} - restore-keys: node_modules + key: explore-node_modules-${{ hashFiles('package-lock.json') }} + restore-keys: explore-node_modules - name: npm clean-install if: steps.explore-cache-node_modules.outputs.cache-hit != 'true' run: | cd explore - npm clean-install --verbose + npm clean-install - name: Check that workflows are up to date run: sbt -v -J-Xmx6g githubWorkflowCheck @@ -211,14 +211,14 @@ jobs: uses: actions/cache@v4 with: path: node_modules - key: node_modules-${{ hashFiles('package-lock.json') }} - restore-keys: node_modules + key: explore-node_modules-${{ hashFiles('package-lock.json') }} + restore-keys: explore-node_modules - name: npm clean-install if: steps.explore-cache-node_modules.outputs.cache-hit != 'true' run: | cd explore - npm clean-install --verbose + npm clean-install - name: Link Explore run: sbt -v -J-Xmx6g explore_app/buildJsModule @@ -299,14 +299,14 @@ jobs: uses: actions/cache@v4 with: path: node_modules - key: node_modules-${{ hashFiles('package-lock.json') }} - restore-keys: node_modules + key: observe-node_modules-${{ hashFiles('package-lock.json') }} + restore-keys: observe-node_modules - name: npm clean-install if: steps.observe-cache-node_modules.outputs.cache-hit != 'true' run: | cd observe/web/client - npm clean-install --verbose + npm clean-install - name: Login to Docker Hub run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login --username nlsoftware --password-stdin @@ -399,17 +399,17 @@ jobs: node-version: 24 cache: npm - - name: Cache Explore node_modules + - name: Cache root node_modules id: root-cache-node_modules uses: actions/cache@v4 with: path: node_modules - key: node_modules-${{ hashFiles('package-lock.json') }} - restore-keys: node_modules + key: root-node_modules-${{ hashFiles('package-lock.json') }} + restore-keys: root-node_modules - name: npm clean-install if: steps.root-cache-node_modules.outputs.cache-hit != 'true' - run: npm clean-install --verbose + run: npm clean-install - name: Import CSS files run: sbt -v -J-Xmx6g '++ ${{ matrix.scala }}' ui_css/lucumaCss diff --git a/build.sbt b/build.sbt index b53559cb7..1cd68489c 100644 --- a/build.sbt +++ b/build.sbt @@ -1060,16 +1060,16 @@ lazy val rootSetupNodeNpmInstall = // Explore NPM cache WorkflowStep.Use( UseRef.Public("actions", "cache", "v4"), - name = Some("Cache Explore node_modules"), + name = Some("Cache root node_modules"), id = Some("root-cache-node_modules"), params = { - val prefix = "node_modules" + val prefix = "root-node_modules" val key = s"$prefix-$${{ hashFiles('package-lock.json') }}" Map("path" -> "node_modules", "key" -> key, "restore-keys" -> prefix) } ), WorkflowStep.Run( - List("npm clean-install --verbose"), + List("npm clean-install"), name = Some("npm clean-install"), cond = Some("steps.root-cache-node_modules.outputs.cache-hit != 'true'") ) @@ -1092,13 +1092,13 @@ lazy val exploreSetupNodeNpmInstall = name = Some("Cache Explore node_modules"), id = Some("explore-cache-node_modules"), params = { - val prefix = "node_modules" + val prefix = "explore-node_modules" val key = s"$prefix-$${{ hashFiles('package-lock.json') }}" Map("path" -> "node_modules", "key" -> key, "restore-keys" -> prefix) } ), WorkflowStep.Run( - List("cd explore", "npm clean-install --verbose"), + List("cd explore", "npm clean-install"), name = Some("npm clean-install"), cond = Some("steps.explore-cache-node_modules.outputs.cache-hit != 'true'") ) @@ -1120,13 +1120,13 @@ lazy val exploreSetupNodeNpmInstall = name = Some("Cache Observe node_modules"), id = Some("observe-cache-node_modules"), params = { - val prefix = "node_modules" + val prefix = "observe-node_modules" val key = s"$prefix-$${{ hashFiles('package-lock.json') }}" Map("path" -> "node_modules", "key" -> key, "restore-keys" -> prefix) } ), WorkflowStep.Run( - List("cd observe/web/client", "npm clean-install --verbose"), + List("cd observe/web/client", "npm clean-install"), name = Some("npm clean-install"), cond = Some("steps.observe-cache-node_modules.outputs.cache-hit != 'true'") )