Skip to content

[data]Test against head. #2832

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 3 commits into from
Mar 6, 2020
Merged

[data]Test against head. #2832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6b9d97
[data]Test against head.
lina128 Mar 5, 2020
5be9a3f
Add build layers to CI.
lina128 Mar 5, 2020
27bb982
Dependency order matters.
lina128 Mar 5, 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
3 changes: 2 additions & 1 deletion scripts/package_dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
{
"tfjs-core": [],
"tfjs-converter": ["tfjs-core"],
"tfjs-layers": ["tfjs-core"]
"tfjs-layers": ["tfjs-core"],
"tfjs-data": ["tfjs-core", "tfjs-layers"]
}
18 changes: 17 additions & 1 deletion tfjs-data/cloudbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,29 @@ steps:
id: 'yarn-common'
args: ['install']

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

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

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

# Run data tests.
- name: 'node:10'
Expand Down
11 changes: 7 additions & 4 deletions tfjs-data/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"miniprogram": "dist/miniprogram",
"license": "Apache-2.0",
"devDependencies": {
"@tensorflow/tfjs-core": "1.6.0",
"@tensorflow/tfjs-layers": "1.6.0",
"@tensorflow/tfjs-core": "link:../tfjs-core",
"@tensorflow/tfjs-layers": "link:../tfjs-layers",
"@types/jasmine": "~2.5.53",
"@types/seedrandom": "^2.4.27",
"@types/utf8": "~2.1.6",
Expand Down Expand Up @@ -41,10 +41,13 @@
},
"scripts": {
"build": "tsc",
"build-core": "cd ../tfjs-core && yarn && yarn build",
"build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",
"build-layers": "cd ../tfjs-layers && yarn && yarn build",
"build-npm": "./scripts/build-npm.sh",
"link-local": "yalc link",
"publish-local": "rimraf dist/ && yarn build-npm && yalc push",
"test": "karma start",
"test": "yarn build-core && yarn build-layers && yarn && karma start",
"test-browsers": "karma start --browsers='Chrome,Firefox'",
"test-node": "ts-node src/test_node.ts",
"test-ci": "./scripts/test-ci.sh",
Expand All @@ -53,7 +56,7 @@
"lint": "tslint -p . -t verbose"
},
"peerDependencies": {
"@tensorflow/tfjs-core": "1.6.0",
"@tensorflow/tfjs-core": "link:../tfjs-core",
"seedrandom": "~2.4.3"
},
"dependencies": {
Expand Down
21 changes: 6 additions & 15 deletions tfjs-data/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,13 @@
# yarn lockfile v1


"@tensorflow/tfjs-core@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.6.0.tgz#8a871de73995e0efc7ea5660df018402c788d285"
integrity sha512-b98jn1pjRuEDVNN6/ZQMFhyYV27ZIsG9CcHSMXq1ohX6ALQQB3mwgrMeC2TEVXFl6/L2vOD8W+txuBRGKHnvpg==
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 ""

"@tensorflow/tfjs-layers@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.6.0.tgz#b0376a243cddec54a69ec843b505f3d4750094ce"
integrity sha512-Nb6yNJT35vbYK/ZiI7wxLcI9BrvGA7GJ7OL+9/B7Mrsq3gq1A8Pv2ULQhPZOvR0J1zl83AMZAACjuGS+L6nLAA==
"@tensorflow/tfjs-layers@link:../tfjs-layers":
version "0.0.0"
uid ""

"@types/estree@0.0.38":
version "0.0.38"
Expand Down