Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7d9db8c

Browse filesBrowse files
aduh95aduh95
committed
tools: keep GN files when updating Merve
PR-URL: #62167 Reviewed-By: Shelley Vohr <shelley.vohr@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 966b700 commit 7d9db8c
Copy full SHA for 7d9db8c

1 file changed

+2-2Lines changed: 2 additions & 2 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎tools/dep_updaters/update-merve.sh‎

Copy file name to clipboardExpand all lines: tools/dep_updaters/update-merve.sh
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ rm "$MERVE_ZIP"
5454

5555
curl -sL -o "$MERVE_LICENSE" "https://raw.githubusercontent.com/anonrig/merve/HEAD/LICENSE-MIT"
5656

57-
echo "Replacing existing merve (except GYP build files)"
58-
mv "$DEPS_DIR/merve/merve.gyp" "$WORKSPACE/"
57+
echo "Replacing existing merve (except GYP/GN build files)"
58+
mv "$DEPS_DIR/merve/merve.gyp" "$DEPS_DIR/merve/BUILD.gn" "$DEPS_DIR/merve/unofficial.gni" "$WORKSPACE/"
5959
rm -rf "$DEPS_DIR/merve"
6060
mv "$WORKSPACE" "$DEPS_DIR/merve"
6161

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.