Browse Source

query-node: extra check to for typeorm link, and checkin yarn.lock

Mokhtar Naamani 4 years ago
parent
commit
1e76bbd32f
2 changed files with 6 additions and 2 deletions
  1. 5 1
      query-node/run-tests.sh
  2. 1 1
      yarn.lock

+ 5 - 1
query-node/run-tests.sh

@@ -17,7 +17,11 @@ trap cleanup EXIT
 export WS_PROVIDER_ENDPOINT_URI=ws://joystream-node:9944/
 
 # Only run codegen if no generated files found
-[ ! -d "generated/" ] && yarn codegen:all
+[ ! -d "generated/" ] && yarn build
+
+# Make sure typeorm is available.. it get removed again when yarn is run again
+# typeorm commandline is used by db:migrate step below.
+ln -s ../../../../../node_modules/typeorm/cli.js generated/graphql-server/node_modules/.bin/typeorm || :
 
 yarn db:up
 yarn db:migrate

+ 1 - 1
yarn.lock

@@ -1396,7 +1396,7 @@
     typeorm-model-generator "^0.4.2"
     warthog "https://github.com/metmirr/warthog/releases/download/v2.20.0/warthog-v2.20.0.tgz"
 
-"@dzlzv/hydra-indexer-lib@0.0.19-legacy.1.26.1", "@dzlzv/hydra-indexer-lib@^0.0.18-legacy.1.26.1":
+"@dzlzv/hydra-indexer-lib@0.0.19-legacy.1.26.1", "@dzlzv/hydra-indexer-lib@^0.0.19-legacy.1.26.1":
   version "0.0.19-legacy.1.26.1"
   resolved "https://registry.yarnpkg.com/@dzlzv/hydra-indexer-lib/-/hydra-indexer-lib-0.0.19-legacy.1.26.1.tgz#346b564845b2014f7a4d9b3976c03e30da8dd309"
   integrity sha512-4pwaSDRIo/1MqxjfSotjv91fkIj/bfZcZx5nqjB9gRT85X28b3WqkqTFrzlGsGGbvUFWAx4WIeQKnY1yrpX89Q==