From e7322174e2baf042d4d95579199d784e371642c6 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Mon, 26 Apr 2021 14:22:37 +0300 Subject: [PATCH] azure fix Signed-off-by: Jari Kolehmainen --- .azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 76e64f0f2c..9842a5fff5 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -40,7 +40,7 @@ jobs: git clone "https://${GH_TOKEN}@github.com/lensapp/lens-ide.git" .lens-ide-overlay rm -rf .lens-ide-overlay/.git cp -r .lens-ide-overlay/* ./ - cp build/package.json.patch . && patch package.json package.json.patch + jq -s '.[0] * .[1]' package.json package.ide.json > package.json displayName: Customize config env: GH_TOKEN: $(LENS_IDE_GH_TOKEN) @@ -90,7 +90,7 @@ jobs: git clone "https://${GH_TOKEN}@github.com/lensapp/lens-ide.git" .lens-ide-overlay rm -rf .lens-ide-overlay/.git cp -r .lens-ide-overlay/* ./ - cp build/package.json.patch . && patch package.json package.json.patch + jq -s '.[0] * .[1]' package.json package.ide.json > package.json displayName: Customize config env: GH_TOKEN: $(LENS_IDE_GH_TOKEN) @@ -142,7 +142,7 @@ jobs: git clone "https://${GH_TOKEN}@github.com/lensapp/lens-ide.git" .lens-ide-overlay rm -rf .lens-ide-overlay/.git cp -r .lens-ide-overlay/* ./ - cp build/package.json.patch . && patch package.json package.json.patch + jq -s '.[0] * .[1]' package.json package.ide.json > package.json displayName: Customize config env: GH_TOKEN: $(LENS_IDE_GH_TOKEN)