From ad212bb943af95cd28d0c9c4e9108253abac373d Mon Sep 17 00:00:00 2001 From: Na Li Date: Thu, 20 Feb 2020 14:15:14 -0800 Subject: [PATCH 1/3] Test against head. --- tfjs-converter/cloudbuild.yml | 8 ++++++++ tfjs-converter/package.json | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tfjs-converter/cloudbuild.yml b/tfjs-converter/cloudbuild.yml index 21291d8286f..9808fd87406 100644 --- a/tfjs-converter/cloudbuild.yml +++ b/tfjs-converter/cloudbuild.yml @@ -14,6 +14,14 @@ steps: args: ['install'] waitFor: ['yarn-common'] +# Build core from master. +- name: 'node:10' + dir: 'tfjs-converter' + id: 'build-core' + entrypoint: 'yarn' + args: ['build-core'] + waitFor: ['yarn-common'] + # Run lint. - name: 'node:10' dir: 'tfjs-converter' diff --git a/tfjs-converter/package.json b/tfjs-converter/package.json index 582185c261b..7fb383244b8 100644 --- a/tfjs-converter/package.json +++ b/tfjs-converter/package.json @@ -15,10 +15,10 @@ }, "license": "Apache-2.0", "peerDependencies": { - "@tensorflow/tfjs-core": "1.5.2" + "@tensorflow/tfjs-core": "link:../tfjs-core" }, "devDependencies": { - "@tensorflow/tfjs-core": "1.5.2", + "@tensorflow/tfjs-core": "link:../tfjs-core", "@types/deep-equal": "^1.0.1", "@types/jasmine": "~2.8.6", "@types/long": "~3.0.32", @@ -55,10 +55,11 @@ }, "scripts": { "build": "yarn gen-json --test && tsc && copyfiles -f src/data/compiled_api.* dist/src/data/", + "build-core": "cd ../tfjs-core && yarn && yarn build", "build-npm": "./scripts/build-npm.sh", "link-local": "yalc link", "publish-local": "yarn build-npm && yalc push", - "test": "yarn gen-json --test && ts-node run_tests.ts", + "test": "yarn && yarn build-core && yarn gen-json --test && ts-node run_tests.ts", "test-ci": "ts-node run_tests.ts", "test-snippets": "ts-node ./scripts/test_snippets.ts", "lint": "tslint -p . -t verbose", From ddb58ee7f87fb3666b0a2e817e64c4a491136962 Mon Sep 17 00:00:00 2001 From: Na Li Date: Thu, 20 Feb 2020 14:30:39 -0800 Subject: [PATCH 2/3] Change order --- tfjs-converter/cloudbuild.yml | 14 +++++++------- tfjs-converter/package.json | 2 +- tfjs-converter/yarn.lock | 14 +++----------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/tfjs-converter/cloudbuild.yml b/tfjs-converter/cloudbuild.yml index 9808fd87406..0f99f42b496 100644 --- a/tfjs-converter/cloudbuild.yml +++ b/tfjs-converter/cloudbuild.yml @@ -6,21 +6,21 @@ steps: id: 'yarn-common' args: ['install'] -# Install converter dependencies. +# Build core from master. - name: 'node:10' dir: 'tfjs-converter' + id: 'build-core' entrypoint: 'yarn' - id: 'yarn' - args: ['install'] + args: ['build-core'] waitFor: ['yarn-common'] -# Build core from master. +# Install converter dependencies. - name: 'node:10' dir: 'tfjs-converter' - id: 'build-core' entrypoint: 'yarn' - args: ['build-core'] - waitFor: ['yarn-common'] + id: 'yarn' + args: ['install'] + waitFor: ['build-core'] # Run lint. - name: 'node:10' diff --git a/tfjs-converter/package.json b/tfjs-converter/package.json index 7fb383244b8..e32d3f8ca96 100644 --- a/tfjs-converter/package.json +++ b/tfjs-converter/package.json @@ -59,7 +59,7 @@ "build-npm": "./scripts/build-npm.sh", "link-local": "yalc link", "publish-local": "yarn build-npm && yalc push", - "test": "yarn && yarn build-core && yarn gen-json --test && ts-node run_tests.ts", + "test": "yarn build-core && yarn && yarn gen-json --test && ts-node run_tests.ts", "test-ci": "ts-node run_tests.ts", "test-snippets": "ts-node ./scripts/test_snippets.ts", "lint": "tslint -p . -t verbose", diff --git a/tfjs-converter/yarn.lock b/tfjs-converter/yarn.lock index bac226939d3..7e49367c2f0 100644 --- a/tfjs-converter/yarn.lock +++ b/tfjs-converter/yarn.lock @@ -55,17 +55,9 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= -"@tensorflow/tfjs-core@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.5.2.tgz#df76752cf7c43987df1548fb69820935bd8215d7" - integrity sha512-Rj6l8xf0PxrEKctvX3bvxjqhHLaCBQT0ChvqFK6//HBu8A1/ao4SzeVKpXKNnP9Niax+qV3c9U9VcOwwIkCMag== - dependencies: - "@types/offscreencanvas" "~2019.3.0" - "@types/seedrandom" "2.4.27" - "@types/webgl-ext" "0.0.30" - "@types/webgl2" "0.0.4" - node-fetch "~2.1.2" - seedrandom "2.4.3" +"@tensorflow/tfjs-core@link:../tfjs-core": + version "0.0.0" + uid "" "@types/deep-equal@^1.0.1": version "1.0.1" From 5671fd6695f3731b0b7e26c69a8f7ca955be8953 Mon Sep 17 00:00:00 2001 From: Na Li Date: Thu, 20 Feb 2020 14:49:28 -0800 Subject: [PATCH 3/3] Change to build-ci because core needs to build snippets --- tfjs-converter/cloudbuild.yml | 2 +- tfjs-converter/package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tfjs-converter/cloudbuild.yml b/tfjs-converter/cloudbuild.yml index 0f99f42b496..be33a2330ed 100644 --- a/tfjs-converter/cloudbuild.yml +++ b/tfjs-converter/cloudbuild.yml @@ -11,7 +11,7 @@ steps: dir: 'tfjs-converter' id: 'build-core' entrypoint: 'yarn' - args: ['build-core'] + args: ['build-core-ci'] waitFor: ['yarn-common'] # Install converter dependencies. diff --git a/tfjs-converter/package.json b/tfjs-converter/package.json index e32d3f8ca96..220712ca108 100644 --- a/tfjs-converter/package.json +++ b/tfjs-converter/package.json @@ -56,6 +56,7 @@ "scripts": { "build": "yarn gen-json --test && tsc && copyfiles -f src/data/compiled_api.* dist/src/data/", "build-core": "cd ../tfjs-core && yarn && yarn build", + "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci", "build-npm": "./scripts/build-npm.sh", "link-local": "yalc link", "publish-local": "yarn build-npm && yalc push",