From 175c1298b84d587516aaf82efba5443c9fdf25e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= Date: Tue, 15 Dec 2020 15:27:23 +0100 Subject: [PATCH] remove all usage of concurrently --- .github/workflows/ci.yml | 18 +++++++++--------- package.json | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6552532c48..fd519deb7d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: id: cacheNodeModules uses: actions/cache@v2 with: - path: '**/node_modules' + path: "**/node_modules" key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }} restore-keys: ${{ runner.os }}-cacheNodeModules3- - name: Get yarn cache directory path @@ -483,7 +483,7 @@ jobs: id: cacheNodeModules uses: actions/cache@v2 with: - path: '**/node_modules' + path: "**/node_modules" key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }} restore-keys: ${{ runner.os }}-cacheNodeModules3- - name: Get yarn cache directory path @@ -505,7 +505,7 @@ jobs: run: yarn --frozen-lockfile --network-timeout 180000 - name: Compile and Download - run: yarn concurrently --max_old_space_size=4095 --names "compile,electron,playwright,builtin-extensions" "yarn compile" "yarn electron x64" "node ./node_modules/playwright/install.js" "yarn download-builtin-extensions" + run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions - name: Run Unit Tests (Electron) id: electron-unit-tests @@ -534,13 +534,13 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: '2.x' + python-version: "2.x" - name: Cache node modules id: cacheNodeModules uses: actions/cache@v2 with: - path: '**/node_modules' + path: "**/node_modules" key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }} restore-keys: ${{ runner.os }}-cacheNodeModules3- - name: Get yarn cache directory path @@ -562,7 +562,7 @@ jobs: run: yarn --frozen-lockfile --network-timeout 180000 - name: Compile and Download - run: yarn concurrently --max_old_space_size=4095 --names "compile,electron,playwright,builtin-extensions" "yarn compile" "yarn electron x64" "node ./node_modules/playwright/install.js" "yarn download-builtin-extensions" + run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions - name: Run Unit Tests (Electron) run: .\scripts\test.bat @@ -589,7 +589,7 @@ jobs: id: cacheNodeModules uses: actions/cache@v2 with: - path: '**/node_modules' + path: "**/node_modules" key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }} restore-keys: ${{ runner.os }}-cacheNodeModules3- - name: Get yarn cache directory path @@ -611,7 +611,7 @@ jobs: run: yarn --frozen-lockfile --network-timeout 180000 - name: Compile and Download - run: yarn concurrently --max_old_space_size=4095 --names "compile,electron,playwright,builtin-extensions" "yarn compile" "yarn electron x64" "node ./node_modules/playwright/install.js" "yarn download-builtin-extensions" + run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions - name: Run Unit Tests (Electron) run: DISPLAY=:10 ./scripts/test.sh @@ -638,7 +638,7 @@ jobs: id: cacheNodeModules uses: actions/cache@v2 with: - path: '**/node_modules' + path: "**/node_modules" key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }} restore-keys: ${{ runner.os }}-cacheNodeModules3- - name: Execute yarn diff --git a/package.json b/package.json index 12e2fdd39ce..fc90cca75a9 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,8 @@ "compile-web": "gulp compile-web --max_old_space_size=4095", "watch-web": "gulp watch-web --max_old_space_size=4095", "eslint": "eslint -c .eslintrc.json --rulesdir ./build/lib/eslint --ext .ts --ext .js ./src/vs ./extensions", - "electron-rebuild": "electron-rebuild --arch=arm64 --force --version=11.0.5" + "electron-rebuild": "electron-rebuild --arch=arm64 --force --version=11.0.5", + "playwright-install": "node node_modules/playwright/install.js" }, "dependencies": { "applicationinsights": "1.0.8",