Skip to content

Update the diff script to be smarter and diff against the merge base. #1990

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
nsthorat merged 17 commits into from
Sep 9, 2019
Merged

Update the diff script to be smarter and diff against the merge base. #1990

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
96fa4d4
Use merge-base for diffing.
Sep 6, 2019
2eae59c
save
Sep 6, 2019
8c195cc
save
Sep 6, 2019
276d52b
save
Sep 6, 2019
2943cbc
save
Sep 6, 2019
d8b1570
save
Sep 6, 2019
8498402
save
Sep 6, 2019
d581204
save
Sep 6, 2019
40b4de6
save
Sep 6, 2019
b622e3e
save
Sep 6, 2019
023a80e
save
Sep 6, 2019
8c8a0dc
save
Sep 6, 2019
17270d6
save
Sep 6, 2019
5ec46d1
save
Sep 6, 2019
76ca258
save
Sep 6, 2019
f368440
save
Sep 6, 2019
f06db2b
save
Sep 9, 2019
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
Prev Previous commit
Next Next commit
save
  • Loading branch information
Nikhil Thorat committed Sep 6, 2019
commit 276d52b1df0f4e9852aba68273c88e595b25b7df
12 changes: 9 additions & 3 deletions scripts/diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,19 @@ exec(
`git clone --depth=1 --single-branch --branch ${branchName} ` +
`https://github.com/tensorflow/tfjs ${CLONE_CURRENT_PATH}`);
exec(
`cd ${CLONE_CURRENT_PATH} && git checkout ${branchName} ` +
`&& git checkout ${commitSha} && cd ..`);
`cd ${CLONE_CURRENT_PATH} && ` +
`git checkout ${branchName} &&` +
`git checkout ${commitSha} && ` +
`cd ..`);

exec(
`git clone --depth=1 --single-branch ` +
`https://github.com/tensorflow/tfjs ${CLONE_MASTER_PATH}`);
exec(`cd ${CLONE_MASTER_PATH} && git fetch origin ${mergeBase} && cd ..`);
exec(
`cd ${CLONE_MASTER_PATH} && ` +
`git fetch origin ${mergeBase} && ` +
`git checkout ${mergeBase} && ` +
`cd ..`);

let triggerAllBuilds = false;
let whitelistDiffOutput = [];
Expand Down