Fix CI

nhooyr · nhooyr · commit 641a7489fd35 · 2020-12-04T02:12:50.000-05:00
diff --git a/ci/dev/lint.sh b/ci/dev/lint.sh
@@ -14,7 +14,7 @@ main() {
 
   cd lib/vscode
   # Run this periodically in vanilla VS code to make sure we don't add any more warnings.
-  yarn eslint --max-warnings=3
+  yarn -s eslint --max-warnings=3
   cd "$OLDPWD"
 }
 
diff --git a/ci/dev/vscode.patch b/ci/dev/vscode.patch
@@ -1,3 +1,13 @@
+diff --git a/.eslintignore b/.eslintignore
+index b2c4a5b6efa856968bbb62c56113004ddb3929e6..035aec8f6a8b0ea8fc6d3d836d160da54aac2fdb 100644
+--- a/.eslintignore
++++ b/.eslintignore
+@@ -14,3 +14,5 @@
+ **/extensions/**/build/**
+ **/extensions/markdown-language-features/media/**
+ **/extensions/typescript-basics/test/colorize-fixtures/**
++# This is a code-server code symlink.
++src/vs/base/node/proxy_agent.ts
 diff --git a/.eslintrc.json b/.eslintrc.json
 index 055bc22f8e48e7dee559b83ac56c12a54c6ad544..14c026c04a7df5ac94bea2856e3a7a513c213775 100644
 --- a/.eslintrc.json
diff --git a/src/node/entry.ts b/src/node/entry.ts
@@ -17,10 +17,10 @@ import {
 } from "./cli"
 import { coderCloudBind } from "./coder_cloud"
 import { commit, version } from "./constants"
+import * as proxyAgent from "./proxy_agent"
 import { register } from "./routes"
 import { humanPath, isFile, open } from "./util"
 import { isChild, wrapper } from "./wrapper"
-import * as proxyAgent from "./proxy_agent"
 
 export const runVsCodeCli = (args: DefaultedArgs): void => {
   logger.debug("forking vs code cli...")
diff --git a/src/node/proxy_agent.ts b/src/node/proxy_agent.ts
@@ -1,6 +1,6 @@
 import { logger } from "@coder/logger"
-import * as proxyagent from "proxy-agent"
 import * as http from "http"
+import * as proxyagent from "proxy-agent"
 
 /**
  * This file does not have anything to do with the code-server proxy.

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ main() {`
`14`	`14`
`15`	`15`	`cd lib/vscode`
`16`	`16`	`# Run this periodically in vanilla VS code to make sure we don't add any more warnings.`
`17`		`- yarn eslint --max-warnings=3`
	`17`	`+ yarn -s eslint --max-warnings=3`
`18`	`18`	`cd "$OLDPWD"`
`19`	`19`	`}`
`20`	`20`