From b43b8d867213382246ee5172ed3c107ef22ab51d Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Tue, 31 Mar 2020 20:20:56 +0200 Subject: [PATCH] Fix build-and-lint tests (#5320) Hardcoding the version breaks as soon as we make a release PR where the version is not 0.0.0. changelog_begin changelog_end --- language-support/ts/codegen/tests/build-and-lint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/language-support/ts/codegen/tests/build-and-lint.sh b/language-support/ts/codegen/tests/build-and-lint.sh index 2e65abc0bf9a..1056f7523f1d 100755 --- a/language-support/ts/codegen/tests/build-and-lint.sh +++ b/language-support/ts/codegen/tests/build-and-lint.sh @@ -44,6 +44,7 @@ PACKAGE_JSON=$(rlocation "$TEST_WORKSPACE/$7") TS_DIR=$(dirname $PACKAGE_JSON) DAML_TYPES=$(rlocation "$TEST_WORKSPACE/$8") DAML_LEDGER=$(rlocation "$TEST_WORKSPACE/$9") +SDK_VERSION=${10} TMP_DAML_TYPES=$TMP_DIR/daml-types TMP_DAML_LEDGER=$TMP_DIR/daml-ledger @@ -64,7 +65,7 @@ PATH=`dirname $YARN`:$PATH $DAML2TS -o daml2ts $DAR rm package.json # Since we eschew using workspaces and resolutions in this test, patch # up the daml-ledger dependency on daml-types. -sed -i"" "s|\"@daml/types\": \"0.0.0\"|\"@daml/types\": \"file:../daml-types\"|" daml-ledger/package.json +sed -i"" "s|\"@daml/types\": \"$SDK_VERSION\"|\"@daml/types\": \"file:../daml-types\"|" daml-ledger/package.json # Build, lint, test. cd build-and-lint-test