From 5ad5b53f9b790b9b96ff324f120f58cb679cf8db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=91=A8=F0=9F=8F=BC=E2=80=8D=F0=9F=92=BB=20Romain=20M?= =?UTF-8?q?arcadier-Muller?= Date: Sat, 7 Dec 2019 19:42:47 -0700 Subject: [PATCH] fix: generate non-overlapping artifacts The @jsii/spec and jsii-spec packages would generate the same build artifact, causing only one of them (jsii-spec) to be considered. This ensures distinct artifact names are generated for each. --- tools/jsii-build-tools/bin/package-js | 10 ++++++++-- tools/jsii-build-tools/bin/package-python | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/jsii-build-tools/bin/package-js b/tools/jsii-build-tools/bin/package-js index e61361e7fc..23558db0b3 100755 --- a/tools/jsii-build-tools/bin/package-js +++ b/tools/jsii-build-tools/bin/package-js @@ -1,5 +1,11 @@ #!/bin/bash set -euo pipefail + rm -fr dist/js -mkdir -p dist/js -mv $(npm pack) dist/js + +package_name=$(node -p "require('./package.json').name") +target_file="dist/js/${package_name/\//-}.tgz" + +mkdir -p $(dirname ${target_file}) + +mv $(npm pack) ${target_file} diff --git a/tools/jsii-build-tools/bin/package-python b/tools/jsii-build-tools/bin/package-python index 8ea2d10df6..300e9e1d36 100755 --- a/tools/jsii-build-tools/bin/package-python +++ b/tools/jsii-build-tools/bin/package-python @@ -3,5 +3,5 @@ set -euo pipefail rm -rf dist/python mkdir -p dist/python -mv *.whl dist/python -mv *.tar.gz dist/python +cp *.whl dist/python +cp *.tar.gz dist/python