Skip to content

Fix node_modules cache prefixes for steps #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2025
Merged

Fix node_modules cache prefixes for steps #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'")
)
Expand All @@ -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'")
)
Expand All @@ -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'")
)
Expand Down