Merge branch 'main' into sorgh/7011

microsoft · Apr 16, 2021 · 690c0b5 · 690c0b5
2 parents cb837f1 + ab63ce7
commit 690c0b5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -39,7 +39,7 @@ jobs:
       - name: yarn build:dev
         run: yarn build:dev
       - name: yarn lint
-        run: yarn lint && yarn lint:extensions
+        run: yarn lint:ci && yarn lint:extensions
       - name: yarn test:coverage
         run: yarn test:coverage
       - name: Coveralls

diff --git a/Composer/package.json b/Composer/package.json
@@ -74,6 +74,7 @@
     "test:integration:open": "cypress open",
     "test:integration:clean": "node scripts/clean-e2e.js",
     "lint": "wsrun --exclude-missing --collect-logs --report lint",
+    "lint:ci": "wsrun --exclude-missing --collect-logs --report --no-prefix lint --format github-actions",
     "lint:fix": "wsrun --exclude-missing --collect-logs --report lint:fix",
     "lint:extensions": "cd ../extensions && yarn lint",
     "typecheck": "concurrently --kill-others-on-fail \"npm:typecheck:*\"",
@@ -124,6 +125,7 @@
     "cypress-plugin-tab": "^1.0.5",
     "eslint": "7.0.0",
     "eslint-config-prettier": "6.11.0",
+    "eslint-formatter-github-actions": "^1.0.0",
     "eslint-plugin-cypress": "2.11.1",
     "eslint-plugin-emotion": "10.0.27",
     "eslint-plugin-format-message": "6.2.3",

diff --git a/Composer/yarn.lock b/Composer/yarn.lock
@@ -11134,6 +11134,11 @@ eslint-config-react-app@5.2.1:
   dependencies:
     confusing-browser-globals "^1.0.9"
 
+eslint-formatter-github-actions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-formatter-github-actions/-/eslint-formatter-github-actions-1.0.0.tgz#7a8f27cc049bff2c9d69d01bb5214db96ddb81b5"
+  integrity sha512-+Mlk6yNkecwRN/AL8ypoTR9xh0aN7Ss0bnJnxNtKIZCdNixAUUbqRIfv/1c/ZdHdzQq58I45nygSOQGNy8Wv6g==
+
 eslint-import-resolver-node@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"