|
|
@@ -47,12 +47,12 @@ jobs:
|
|
|
$GCLIENT_EXTRA_ARGS \
|
|
|
"$GITHUB_SERVER_URL/$GITHUB_REPOSITORY"
|
|
|
|
|
|
- ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags
|
|
|
+ ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags -vvvvv
|
|
|
if [ "$IS_RELEASE" != "true" ]; then
|
|
|
# Re-export all the patches to check if there were changes.
|
|
|
python3 src/electron/script/export_all_patches.py src/electron/patches/config.json
|
|
|
cd src/electron
|
|
|
- git update-index --refresh || true
|
|
|
+ # git update-index --refresh || true
|
|
|
# TODO(vertedinde): Let's not stress on patchup right now, just sync it
|
|
|
# if ! git diff-index --quiet HEAD --; then
|
|
|
# # There are changes to the patches. Make a git commit with the updated patches
|
VerteDinde