Fix release expansion issue (#15251)
* Fix release expansion issue Fix #14578 Signed-off-by: Andrew Thornton <art27@cantab.net> * fix cache statement too Signed-off-by: Andrew Thornton <art27@cantab.net> * and update the npmrcs Signed-off-by: Andrew Thornton <art27@cantab.net> * as per @silverwind Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
		
							parent
							
								
									54eae008d9
								
							
						
					
					
						commit
						cc2d540092
					
				
					 3 changed files with 4 additions and 2 deletions
				
			
		
							
								
								
									
										1
									
								
								.npmrc
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								.npmrc
									
									
									
									
									
								
							|  | @ -2,3 +2,4 @@ audit=false | |||
| fund=false | ||||
| package-lock=true | ||||
| save-exact=true | ||||
| cache=.npm-cache | ||||
|  |  | |||
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							|  | @ -671,11 +671,11 @@ npm-cache: .npm-cache $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui | |||
| 
 | ||||
| .npm-cache: package-lock.json | ||||
| 	rm -rf .npm-cache | ||||
| 	$(eval ESBUILD_VERSION := `node -p "require('./package-lock.json').dependencies.esbuild.version"`) | ||||
| 	$(eval ESBUILD_VERSION := $(shell node -p "require('./package-lock.json').dependencies.esbuild.version")) | ||||
| 	npm config --userconfig=.npmrc set cache=.npm-cache | ||||
| 	rm -rf node_modules && npm install --no-save | ||||
| 	npm config --userconfig=$(FOMANTIC_WORK_DIR)/.npmrc set cache=../../.npm-cache | ||||
| 	echo esbuild-{darwin-64,linux-{arm,arm64,32,64},windows-{32,64}}@$(ESBUILD_VERSION) | tr " " "\n" | xargs -n 1 -P 4 npm cache add | ||||
| 	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 | ||||
| 	rm -rf $(FOMANTIC_WORK_DIR)/node_modules | ||||
| 	@touch .npm-cache | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,2 +1,3 @@ | |||
| optional=false | ||||
| package-lock=false | ||||
| cache=../../.npm-cache | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue