diff options
| author | zeripath <art27@cantab.net> | 2021-04-02 07:49:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-02 14:49:53 +0800 |
| commit | cc2d540092149166c9a0cef886b2e952ac9c75d7 (patch) | |
| tree | 8ccf015d11a9566ac5dd543fdeba0b17c94a04da /Makefile | |
| parent | 54eae008d9e5f8e3d751c5f8975a86113850b487 (diff) | |
| download | gitea-cc2d540092149166c9a0cef886b2e952ac9c75d7.tar.gz gitea-cc2d540092149166c9a0cef886b2e952ac9c75d7.zip | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |