Skip to content

Conversation

@lina128
Copy link
Collaborator

@lina128 lina128 commented Mar 6, 2020

The symlink is changed back to pinned version after release. I thought the generated release branch won't be merged back to master, but it does. Short term solution is to apply the same strategy that WASM package use to use script to change back to symlink. Cons is, (1) people need to remember run test at least once before submit the PR, because CI won't do the link. (2) it's possible people may develop against pinned version if they don't run the test first.

Long term solution (hopefully will come soon), always keep symlink in development code and master branch. Have a dedicated release branch for bumping versions. Always publish from the release branch.


This change is Reviewable

Copy link
Contributor

@nsthorat nsthorat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 1 approvals obtained (waiting on @dsmilkov, @lina128, @nsthorat, and @pyu10055)


tfjs-converter/scripts/link-core-master.js, line 1 at r1 (raw file):

#!/usr/bin/env node

can we put this script in the union package and share it?

@lina128
Copy link
Collaborator Author

lina128 commented Mar 6, 2020

Reviewable status: 0 of 1 approvals obtained (waiting on @dsmilkov, @lina128, @nsthorat, and @pyu10055)

tfjs-converter/scripts/link-core-master.js, line 1 at r1 (raw file):

#!/usr/bin/env node

can we put this script in the union package and share it?

Done.

Copy link
Contributor

@dsmilkov dsmilkov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 2 files at r2.
Reviewable status: 0 of 1 approvals obtained (waiting on @dsmilkov, @lina128, and @pyu10055)


tfjs-converter/package.json, line 57 at r2 (raw file):

  },
  "scripts": {
    "build": "yarn gen-json --test && tsc",

can you call link-core-master here (build) as well

Copy link
Contributor

@dsmilkov dsmilkov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 1 approvals obtained (waiting on @dsmilkov, @lina128, and @pyu10055)


tfjs-converter/package.json, line 57 at r2 (raw file):

Previously, dsmilkov (Daniel Smilkov) wrote…

can you call link-core-master here (build) as well

or is this used from our CI? maybe split into "build" and "build-ci" in that case?

@lina128
Copy link
Collaborator Author

lina128 commented Mar 6, 2020

Reviewable status: 0 of 1 approvals obtained (waiting on @dsmilkov, @lina128, and @pyu10055)

tfjs-converter/package.json, line 57 at r2 (raw file):

Previously, dsmilkov (Daniel Smilkov) wrote…
or is this used from our CI? maybe split into "build" and "build-ci" in that case?

Hi Daniel, build is used in CI and build-npm.sh. For build-npm, we shouldn't link to core. For CI, the link-to-core is done in an earlier step.

Copy link
Contributor

@dsmilkov dsmilkov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 1 approvals obtained (waiting on @lina128 and @pyu10055)


tfjs-converter/package.json, line 57 at r2 (raw file):

Previously, lina128 (Na Li) wrote…

Hi Daniel, build is used in CI and build-npm.sh. For build-npm, we shouldn't link to core. For CI, the link-to-core is done in an earlier step.

so can we split into two: "build" and "build-ci". "build" calls "link-core-master" but "build-ci" doesn't. Just like we do for wasm:https://github.com/tensorflow/tfjs/blob/master/tfjs-backend-wasm/package.json#L16

this way both "yarn build" and "yarn test" will assure that core is linked at master, while "yarn build-ci" and "yarn test-ci" will not. Makes it symmetric with "test" and "test-ci"

Copy link
Contributor

@dsmilkov dsmilkov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 3 files at r1, 3 of 3 files at r3.
Reviewable status: :shipit: complete! 1 of 1 approvals obtained (waiting on @pyu10055)

@lina128 lina128 merged commit d7fe8a0 into tensorflow:master Mar 6, 2020
@lina128 lina128 deleted the converter branch April 14, 2020 23:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants