Skip to content

Commit cc2d540

Browse files
zeripathsilverwind
andauthored
Fix release expansion issue (#15251)
* Fix release expansion issue Fix #14578 Signed-off-by: Andrew Thornton <[email protected]> * fix cache statement too Signed-off-by: Andrew Thornton <[email protected]> * and update the npmrcs Signed-off-by: Andrew Thornton <[email protected]> * as per @silverwind Co-authored-by: silverwind <[email protected]> Co-authored-by: silverwind <[email protected]>
1 parent 54eae00 commit cc2d540

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ audit=false
22
fund=false
33
package-lock=true
44
save-exact=true
5+
cache=.npm-cache

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -671,11 +671,11 @@ npm-cache: .npm-cache $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui
671671

672672
.npm-cache: package-lock.json
673673
rm -rf .npm-cache
674-
$(eval ESBUILD_VERSION := `node -p "require('./package-lock.json').dependencies.esbuild.version"`)
674+
$(eval ESBUILD_VERSION := $(shell node -p "require('./package-lock.json').dependencies.esbuild.version"))
675675
npm config --userconfig=.npmrc set cache=.npm-cache
676676
rm -rf node_modules && npm install --no-save
677677
npm config --userconfig=$(FOMANTIC_WORK_DIR)/.npmrc set cache=../../.npm-cache
678-
echo esbuild-{darwin-64,linux-{arm,arm64,32,64},windows-{32,64}}@$(ESBUILD_VERSION) | tr " " "\n" | xargs -n 1 -P 4 npm cache add
678+
echo $(foreach build, darwin-64 $(foreach arch,arm arm64 32 64,linux-${arch}) $(foreach arch,32 64,windows-${arch}), esbuild-${build}@$(ESBUILD_VERSION)) | tr " " "\n" | xargs -n 1 -P 4 npm cache add
679679
rm -rf $(FOMANTIC_WORK_DIR)/node_modules
680680
@touch .npm-cache
681681

web_src/fomantic/.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
optional=false
22
package-lock=false
3+
cache=../../.npm-cache

0 commit comments

Comments
 (0)