This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new a9aac1a7ff2 kie-issues#3482: Use 'pnpm exec' when calling global
binaries to avoid `--if-present` bug in pnpm (#3490)
a9aac1a7ff2 is described below
commit a9aac1a7ff28890439bb2a583ea00ea4d50f5de2
Author: Thiago Lugli <[email protected]>
AuthorDate: Fri Mar 6 12:55:41 2026 -0300
kie-issues#3482: Use 'pnpm exec' when calling global binaries to avoid
`--if-present` bug in pnpm (#3490)
---
packages/dev-deployment-dmn-form-webapp-image/package.json | 10 +++++-----
packages/kie-sandbox-distribution/package.json | 2 +-
packages/sonataflow-image-common/resources/Makefile | 2 +-
packages/sonataflow-operator/Makefile | 10 +++++-----
packages/sonataflow-operator/hack/bump-version.sh | 8 ++++----
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/packages/dev-deployment-dmn-form-webapp-image/package.json
b/packages/dev-deployment-dmn-form-webapp-image/package.json
index 774bd446c55..a07dbe101cc 100644
--- a/packages/dev-deployment-dmn-form-webapp-image/package.json
+++ b/packages/dev-deployment-dmn-form-webapp-image/package.json
@@ -23,12 +23,12 @@
"copy:image-env-to-json": "run-script-os",
"copy:image-env-to-json:linux:darwin": "cp
./node_modules/@kie-tools/image-env-to-json/dist/image-env-to-json-linux-amd64
./dist-dev/",
"copy:image-env-to-json:win32": "pnpm powershell \"Copy-Item
./node_modules/@kie-tools/image-env-to-json/dist/image-env-to-json-linux-amd64
./dist-dev/\"",
- "create-test-image:build-only": "kie-tools--image-builder build -r
\"$(pnpm build-env devDeploymentDmnFormWebappImage.registry)\" -a \"$(pnpm
build-env devDeploymentDmnFormWebappImage.account)\" -n \"$(pnpm build-env
devDeploymentDmnFormWebappImage.name)\" -t \"$(pnpm build-env
devDeploymentDmnFormWebappImage.buildTag)\"",
- "create-test-image:kind": "kie-tools--image-builder kind -r \"$(pnpm
build-env devDeploymentDmnFormWebappImage.registry)\" -a \"$(pnpm build-env
devDeploymentDmnFormWebappImage.account)\" -n \"$(pnpm build-env
devDeploymentDmnFormWebappImage.name)\" -t \"$(pnpm build-env
devDeploymentDmnFormWebappImage.buildTag)\" --kind-cluster-name
kie-sandbox-dev-cluster",
- "create-test-image:minikube": "kie-tools--image-builder minikube -r
\"$(pnpm build-env devDeploymentDmnFormWebappImage.registry)\" -a \"$(pnpm
build-env devDeploymentDmnFormWebappImage.account)\" -n \"$(pnpm build-env
devDeploymentDmnFormWebappImage.name)\" -t \"$(pnpm build-env
devDeploymentDmnFormWebappImage.buildTag)\"",
- "create-test-image:openshift": "kie-tools--image-builder openshift -r
\"$(pnpm build-env devDeploymentDmnFormWebappImage.registry)\" -a \"$(pnpm
build-env devDeploymentDmnFormWebappImage.account)\" -n \"$(pnpm build-env
devDeploymentDmnFormWebappImage.name)\" -t \"$(pnpm build-env
devDeploymentDmnFormWebappImage.buildTag)\"",
+ "create-test-image:build-only": "kie-tools--image-builder build -r
\"$(build-env devDeploymentDmnFormWebappImage.registry)\" -a \"$(build-env
devDeploymentDmnFormWebappImage.account)\" -n \"$(build-env
devDeploymentDmnFormWebappImage.name)\" -t \"$(build-env
devDeploymentDmnFormWebappImage.buildTag)\"",
+ "create-test-image:kind": "kie-tools--image-builder kind -r \"$(build-env
devDeploymentDmnFormWebappImage.registry)\" -a \"$(build-env
devDeploymentDmnFormWebappImage.account)\" -n \"$(build-env
devDeploymentDmnFormWebappImage.name)\" -t \"$(build-env
devDeploymentDmnFormWebappImage.buildTag)\" --kind-cluster-name
kie-sandbox-dev-cluster",
+ "create-test-image:minikube": "kie-tools--image-builder minikube -r
\"$(build-env devDeploymentDmnFormWebappImage.registry)\" -a \"$(build-env
devDeploymentDmnFormWebappImage.account)\" -n \"$(build-env
devDeploymentDmnFormWebappImage.name)\" -t \"$(build-env
devDeploymentDmnFormWebappImage.buildTag)\"",
+ "create-test-image:openshift": "kie-tools--image-builder openshift -r
\"$(build-env devDeploymentDmnFormWebappImage.registry)\" -a \"$(build-env
devDeploymentDmnFormWebappImage.account)\" -n \"$(build-env
devDeploymentDmnFormWebappImage.name)\" -t \"$(build-env
devDeploymentDmnFormWebappImage.buildTag)\"",
"env-json:schema:generate": "ts-json-schema-generator --path
./node_modules/@kie-tools/dev-deployment-dmn-form-webapp/src/env/EnvJson.ts
--type EnvJson --id EnvJson --out ./dist-dev/EnvJson.schema.json",
- "image:docker:build": "kie-tools--image-builder build -r \"$(pnpm
build-env devDeploymentDmnFormWebappImage.registry)\" -a \"$(pnpm build-env
devDeploymentDmnFormWebappImage.account)\" -n \"$(pnpm build-env
devDeploymentDmnFormWebappImage.name)\" -t \"$(pnpm build-env
devDeploymentDmnFormWebappImage.buildTag)\"",
+ "image:docker:build": "kie-tools--image-builder build -r \"$(build-env
devDeploymentDmnFormWebappImage.registry)\" -a \"$(build-env
devDeploymentDmnFormWebappImage.account)\" -n \"$(build-env
devDeploymentDmnFormWebappImage.name)\" -t \"$(build-env
devDeploymentDmnFormWebappImage.buildTag)\"",
"powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted
-Command"
},
"dependencies": {
diff --git a/packages/kie-sandbox-distribution/package.json
b/packages/kie-sandbox-distribution/package.json
index d4c0e664fa6..ae21a23ec86 100644
--- a/packages/kie-sandbox-distribution/package.json
+++ b/packages/kie-sandbox-distribution/package.json
@@ -16,7 +16,7 @@
"build:dev": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm docker:build\"",
"build:prod": "run-script-if --bool \"$(build-env containerImages.build)\"
--then \"pnpm docker:build\" \"pnpm test\"",
"docker:build": "docker compose build",
- "docker:create-env-file": "rimraf .env && pnpm build-env
--print-dotenv:self > .env",
+ "docker:create-env-file": "rimraf .env && pnpm exec build-env
--print-dotenv:self > .env",
"docker:down": "docker compose down",
"docker:start": "docker compose up -d --wait",
"docker:start-no-pull": "docker compose up -d --wait --pull=never",
diff --git a/packages/sonataflow-image-common/resources/Makefile
b/packages/sonataflow-image-common/resources/Makefile
index 9575310bc98..a6b1c0a5b6c 100644
--- a/packages/sonataflow-image-common/resources/Makefile
+++ b/packages/sonataflow-image-common/resources/Makefile
@@ -27,7 +27,7 @@ BUILD_ENGINE_OPTIONS ?= --no-squash
KOGITO_IMAGE_NAME ?= # Image name
KOGITO_IMAGE_REGISTRY ?= 'docker.io'
KOGITO_IMAGE_REGISTRY_ACCOUNT ?= 'apache'
-KOGITO_IMAGE_TAG ?= $(shell pnpm build-env
root.streamName) # Setting a default value if KOGITO_IMAGE_TAG env is not
present
+KOGITO_IMAGE_TAG ?= $(shell pnpm exec build-env
root.streamName) # Setting a default value if KOGITO_IMAGE_TAG env is not
present
KOGITO_FULL_IMAGE_NAME :=
$(KOGITO_IMAGE_REGISTRY)/$(KOGITO_IMAGE_REGISTRY_ACCOUNT)/$(KOGITO_IMAGE_NAME)
KOGITO_IMAGE_FILENAME := ${KOGITO_IMAGE_NAME}-image.yaml
diff --git a/packages/sonataflow-operator/Makefile
b/packages/sonataflow-operator/Makefile
index bf7ac63d3a7..297356de4e1 100644
--- a/packages/sonataflow-operator/Makefile
+++ b/packages/sonataflow-operator/Makefile
@@ -20,8 +20,8 @@
# To re-generate a bundle for another specific version without changing the
standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export
VERSION=0.0.2)
-VERSION ?= $(shell pnpm build-env sonataFlowOperator.version)
-IMAGE_TAG ?= $(shell pnpm build-env sonataFlowOperator.buildTag)
+VERSION ?= $(shell pnpm exec build-env sonataFlowOperator.version)
+IMAGE_TAG ?= $(shell pnpm exec build-env sonataFlowOperator.buildTag)
# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g
CHANNELS = "candidate,fast,stable")
@@ -47,7 +47,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS)
$(BUNDLE_DEFAULT_CHANNEL)
#
# For example, running 'make bundle-build bundle-push catalog-build
catalog-push' will build and push both
# apache/sonataflow-operator-bundle:$VERSION and
apache/sonataflow-operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= $(shell pnpm build-env sonataFlowOperator.registry)/$(shell
pnpm build-env sonataFlowOperator.account)/$(shell pnpm build-env
sonataFlowOperator.name)
+IMAGE_TAG_BASE ?= $(shell pnpm exec build-env
sonataFlowOperator.registry)/$(shell pnpm exec build-env
sonataFlowOperator.account)/$(shell pnpm exec build-env sonataFlowOperator.name)
# BUNDLE_IMG defines the image:tag used for the bundle.
# You can use it as an arg. (E.g make bundle-build
BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
@@ -486,8 +486,8 @@ before-pr: generate-all test ## Run generate-all before
executing tests.
.PHONY: load-docker-image
load-docker-image: install-kind
kind load docker-image $(IMG)
- kind load docker-image $(shell pnpm build-env
sonataFlowOperator.sonataflowBuilderImage)
- kind load docker-image $(shell pnpm build-env
sonataFlowOperator.sonataflowDevModeImage)
+ kind load docker-image $(shell pnpm exec build-env
sonataFlowOperator.sonataflowBuilderImage)
+ kind load docker-image $(shell pnpm exec build-env
sonataFlowOperator.sonataflowDevModeImage)
.PHONY: install-kind
install-kind:
diff --git a/packages/sonataflow-operator/hack/bump-version.sh
b/packages/sonataflow-operator/hack/bump-version.sh
index 270a0940055..f2dc0776844 100755
--- a/packages/sonataflow-operator/hack/bump-version.sh
+++ b/packages/sonataflow-operator/hack/bump-version.sh
@@ -20,10 +20,10 @@
set -e
-imageName=$(pnpm build-env sonataFlowOperator.registry)/$(pnpm build-env
sonataFlowOperator.account)/$(pnpm build-env sonataFlowOperator.name)
-imageTag=$(pnpm build-env sonataFlowOperator.buildTag)
-platformTag=$(pnpm build-env sonataFlowOperator.platformTag)
-version=$(pnpm build-env sonataFlowOperator.version)
+imageName=$(pnpm exec build-env sonataFlowOperator.registry)/$(pnpm exec
build-env sonataFlowOperator.account)/$(pnpm exec build-env
sonataFlowOperator.name)
+imageTag=$(pnpm exec build-env sonataFlowOperator.buildTag)
+platformTag=$(pnpm exec build-env sonataFlowOperator.platformTag)
+version=$(pnpm exec build-env sonataFlowOperator.version)
if [ -z "${version}" ]; then
echo "Please inform the new version"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
