mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Remove building extensions as part of build
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
parent
a4b96e5cd8
commit
4383bbdc11
@ -11,7 +11,6 @@ module.exports = {
|
||||
"**/dist/**/*",
|
||||
"**/static/**/*",
|
||||
"**/site/**/*",
|
||||
"extensions/*/*.tgz",
|
||||
"build/webpack/**/*",
|
||||
],
|
||||
settings: {
|
||||
|
||||
4
.github/workflows/test.yml
vendored
4
.github/workflows/test.yml
vendored
@ -57,10 +57,6 @@ jobs:
|
||||
name: Run tests
|
||||
if: ${{ matrix.type == 'unit' }}
|
||||
|
||||
- run: make test-extensions
|
||||
name: Run In-tree Extension tests
|
||||
if: ${{ matrix.type == 'unit' }}
|
||||
|
||||
- run: make ci-validate-dev
|
||||
if: ${{ contains(github.event.pull_request.labels.*.name, 'dependencies') && matrix.type == 'unit' }}
|
||||
name: Validate dev mode will work
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,7 +14,6 @@ src/extensions/*/*.js
|
||||
src/extensions/*/*.d.ts
|
||||
types/extension-api.d.ts
|
||||
types/extension-renderer-api.d.ts
|
||||
extensions/*/dist
|
||||
docs/extensions/api
|
||||
site/
|
||||
build/webpack/
|
||||
|
||||
6
.idea/lens.iml
generated
6
.idea/lens.iml
generated
@ -6,10 +6,6 @@
|
||||
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/node_modules" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/extensions/kube-object-event-status/node_modules" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/extensions/metrics-cluster-feature/node_modules" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/extensions/node-menu/node_modules" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/extensions/pod-menu/node_modules" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/static/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/src/extensions/npm/extensions/dist" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/dist" />
|
||||
@ -20,4 +16,4 @@
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="ogre-tools" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
</module>
|
||||
|
||||
35
Makefile
35
Makefile
@ -5,10 +5,6 @@ CMD_ARGS = $(filter-out $@,$(MAKECMDGOALS))
|
||||
|
||||
NPM_RELEASE_TAG ?= latest
|
||||
ELECTRON_BUILDER_EXTRA_ARGS ?=
|
||||
EXTENSIONS_DIR = ./extensions
|
||||
extensions = $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), ${dir})
|
||||
extension_node_modules = $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), ${dir}/node_modules)
|
||||
extension_dists = $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), ${dir}/dist)
|
||||
|
||||
ifeq ($(OS),Windows_NT)
|
||||
DETECTED_OS := Windows
|
||||
@ -28,10 +24,10 @@ compile-dev: node_modules
|
||||
yarn compile:renderer --cache
|
||||
|
||||
.PHONY: validate-dev
|
||||
ci-validate-dev: binaries/client build-extensions compile-dev
|
||||
ci-validate-dev: binaries/client compile-dev
|
||||
|
||||
.PHONY: dev
|
||||
dev: binaries/client build-extensions
|
||||
dev: binaries/client
|
||||
rm -rf static/build/
|
||||
yarn run build:tray-icons
|
||||
yarn dev
|
||||
@ -54,7 +50,6 @@ integration: build
|
||||
|
||||
.PHONY: build
|
||||
build: node_modules binaries/client
|
||||
$(MAKE) build-extensions -B
|
||||
yarn run build:tray-icons
|
||||
yarn run compile
|
||||
ifeq "$(DETECTED_OS)" "Windows"
|
||||
@ -63,26 +58,6 @@ ifeq "$(DETECTED_OS)" "Windows"
|
||||
endif
|
||||
yarn run electron-builder --publish onTag $(ELECTRON_BUILDER_EXTRA_ARGS)
|
||||
|
||||
.NOTPARALLEL: $(extension_node_modules)
|
||||
$(extension_node_modules): node_modules
|
||||
cd $(@:/node_modules=) && ../../node_modules/.bin/npm install --no-audit --no-fund --no-save
|
||||
|
||||
$(extension_dists): src/extensions/npm/extensions/dist $(extension_node_modules)
|
||||
cd $(@:/dist=) && ../../node_modules/.bin/npm run build
|
||||
rm -rf ./node_modules/$(shell basename $(@:/dist=))
|
||||
|
||||
.PHONY: clean-old-extensions
|
||||
clean-old-extensions:
|
||||
find ./extensions -mindepth 1 -maxdepth 1 -type d '!' -exec test -e '{}/package.json' \; -exec rm -rf {} \;
|
||||
|
||||
.PHONY: build-extensions
|
||||
build-extensions: node_modules clean-old-extensions $(extension_dists)
|
||||
yarn install --check-files --frozen-lockfile --network-timeout=100000
|
||||
|
||||
.PHONY: test-extensions
|
||||
test-extensions: $(extension_node_modules)
|
||||
$(foreach dir, $(extensions), (cd $(dir) && npm run test || exit $?);)
|
||||
|
||||
src/extensions/npm/extensions/__mocks__:
|
||||
cp -r __mocks__ src/extensions/npm/extensions/
|
||||
|
||||
@ -113,16 +88,12 @@ build-docs:
|
||||
docs: build-docs
|
||||
yarn mkdocs-serve-local
|
||||
|
||||
.PHONY: clean-extensions
|
||||
clean-extensions:
|
||||
rm -rf $(EXTENSIONS_DIR)/*/{dist,node_modules,*.tgz}
|
||||
|
||||
.PHONY: clean-npm
|
||||
clean-npm:
|
||||
rm -rf src/extensions/npm/extensions/{dist,__mocks__,node_modules}
|
||||
|
||||
.PHONY: clean
|
||||
clean: clean-npm clean-extensions
|
||||
clean: clean-npm
|
||||
rm -rf binaries/client
|
||||
rm -rf dist
|
||||
rm -rf static/build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user