diff --git a/packages/wrangler-devtools/Makefile b/packages/wrangler-devtools/Makefile index 3c34c73097a7..84698f33f768 100644 --- a/packages/wrangler-devtools/Makefile +++ b/packages/wrangler-devtools/Makefile @@ -1,16 +1,21 @@ ROOT = $(realpath .) # The upstream devtools commit upon which our patches are based -HEAD = f931aec3eca7c860dc4d657f328daca19d19221d -PATCHES = $(shell ls ${PWD}/patches/*.patch) +DEVTOOLS_HEAD = f931aec3eca7c860dc4d657f328daca19d19221d +DEVTOOLS_PATCHES = $(shell ls ${PWD}/patches/*.patch) + +# The upstream depot_tools commit upon which our patches are based +DEPOT_TOOLS_HEAD = dbcecc90179a25159dc62f6ed00ae244360297e8 + depot: git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git depot + git -C depot checkout $(DEPOT_TOOLS_HEAD) devtools-frontend: depot $(ROOT)/depot/fetch devtools-frontend - git -C devtools-frontend checkout $(HEAD) + git -C devtools-frontend checkout $(DEVTOOLS_HEAD) git -C devtools-frontend config user.email "workers-devprod@cloudflare.com" git -C devtools-frontend config user.name "Workers DevProd" - git -C devtools-frontend am $(PATCHES) + git -C devtools-frontend am $(DEVTOOLS_PATCHES) devtools-frontend/out/Default/gen/front_end: devtools-frontend cd devtools-frontend && $(ROOT)/depot/gclient sync @@ -27,4 +32,4 @@ cleanup: rm -rf devtools-frontend .gclient* .cipd node_modules depot test: - git -C devtools-frontend am $(PATCHES) + git -C devtools-frontend am $(DEVTOOLS_PATCHES)