From db8eff1085591cde76f05d387ae9d995697f3103 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 16 Jan 2022 15:14:33 +0100
Subject: [PATCH] tests - try to fix macOS GH CI

---
 .github/workflows/ci.yml | 18 +++++++++---------
 package.json             |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8f32390025f..9d5f9545464 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,6 +69,9 @@ jobs:
       - name: Compile and Download
         run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
 
+      - name: Compile Integration Tests
+        run: yarn compile-integration-tests
+
       - name: Run Unit Tests (Electron)
         run: .\scripts\test.bat
 
@@ -78,9 +81,6 @@ jobs:
       - name: Run Unit Tests (Browser, Chromium)
         run: yarn test-browser --browser chromium
 
-      - name: Compile Integration Tests
-        run: yarn --cwd test/integration/browser compile
-
       - name: Run Integration Tests (Electron)
         run: .\scripts\test-integration.bat
 
@@ -146,6 +146,9 @@ jobs:
       - name: Compile and Download
         run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
 
+      - name: Compile Integration Tests
+        run: yarn compile-integration-tests
+
       - name: Run Unit Tests (Electron)
         id: electron-unit-tests
         run: DISPLAY=:10 ./scripts/test.sh
@@ -158,9 +161,6 @@ jobs:
         id: browser-unit-tests
         run: DISPLAY=:10 yarn test-browser --browser chromium
 
-      - name: Compile Integration Tests
-        run: yarn --cwd test/integration/browser compile
-
       - name: Run Integration Tests (Electron)
         id: electron-integration-tests
         run: DISPLAY=:10 ./scripts/test-integration.sh
@@ -218,6 +218,9 @@ jobs:
       - name: Compile and Download
         run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
 
+      - name: Compile Integration Tests
+        run: yarn compile-integration-tests
+
       # This is required for keytar unittests, otherwise we hit
       # https://github.com/atom/node-keytar/issues/76
       - name: Create temporary keychain
@@ -235,9 +238,6 @@ jobs:
       - name: Run Unit Tests (Browser, Chromium)
         run: DISPLAY=:10 yarn test-browser --browser chromium
 
-      - name: Compile Integration Tests
-        run: yarn --cwd test/integration/browser compile
-
       - name: Run Integration Tests (Electron)
         run: DISPLAY=:10 ./scripts/test-integration.sh
 
diff --git a/package.json b/package.json
index 51cf2539cc9..3a8da7f824c 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "playwright-install": "node build/azure-pipelines/common/installPlaywright.js",
     "compile-build": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js compile-build",
     "compile-extensions-build": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js compile-extensions-build",
+    "compile-integration-tests": "tsc -p test/integration/browser",
     "minify-vscode": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode",
     "minify-vscode-reh": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode-reh",
     "minify-vscode-reh-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode-reh-web",