Skip to content

[converter] Test against head. #2780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 24, 2020
Merged

[converter] Test against head. #2780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad212bb
Test against head.
lina128 Feb 20, 2020
ddb58ee
Change order
lina128 Feb 20, 2020
5671fd6
Change to build-ci because core needs to build snippets
lina128 Feb 20, 2020
224b2a6
Merge branch 'master' into converter
lina128 Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion tfjs-converter/cloudbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,21 @@ steps:
id: 'yarn-common'
args: ['install']

# Build core from master.
- name: 'node:10'
dir: 'tfjs-converter'
id: 'build-core'
entrypoint: 'yarn'
args: ['build-core-ci']
waitFor: ['yarn-common']

# Install converter dependencies.
- name: 'node:10'
dir: 'tfjs-converter'
entrypoint: 'yarn'
id: 'yarn'
args: ['install']
waitFor: ['yarn-common']
waitFor: ['build-core']

# Run lint.
- name: 'node:10'
Expand Down
8 changes: 5 additions & 3 deletions tfjs-converter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -55,10 +55,12 @@
},
"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",
"test": "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",
Expand Down
14 changes: 3 additions & 11 deletions tfjs-converter/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down