remove all usage of concurrently
This commit is contained in:
parent
7743d971b1
commit
175c1298b8
2 changed files with 11 additions and 10 deletions
18
.github/workflows/ci.yml
vendored
18
.github/workflows/ci.yml
vendored
|
@ -27,7 +27,7 @@ jobs:
|
||||||
id: cacheNodeModules
|
id: cacheNodeModules
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: '**/node_modules'
|
path: "**/node_modules"
|
||||||
key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
|
key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
|
||||||
restore-keys: ${{ runner.os }}-cacheNodeModules3-
|
restore-keys: ${{ runner.os }}-cacheNodeModules3-
|
||||||
- name: Get yarn cache directory path
|
- name: Get yarn cache directory path
|
||||||
|
@ -483,7 +483,7 @@ jobs:
|
||||||
id: cacheNodeModules
|
id: cacheNodeModules
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: '**/node_modules'
|
path: "**/node_modules"
|
||||||
key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
|
key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
|
||||||
restore-keys: ${{ runner.os }}-cacheNodeModules3-
|
restore-keys: ${{ runner.os }}-cacheNodeModules3-
|
||||||
- name: Get yarn cache directory path
|
- name: Get yarn cache directory path
|
||||||
|
@ -505,7 +505,7 @@ jobs:
|
||||||
run: yarn --frozen-lockfile --network-timeout 180000
|
run: yarn --frozen-lockfile --network-timeout 180000
|
||||||
|
|
||||||
- name: Compile and Download
|
- 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)
|
- name: Run Unit Tests (Electron)
|
||||||
id: electron-unit-tests
|
id: electron-unit-tests
|
||||||
|
@ -534,13 +534,13 @@ jobs:
|
||||||
|
|
||||||
- uses: actions/setup-python@v2
|
- uses: actions/setup-python@v2
|
||||||
with:
|
with:
|
||||||
python-version: '2.x'
|
python-version: "2.x"
|
||||||
|
|
||||||
- name: Cache node modules
|
- name: Cache node modules
|
||||||
id: cacheNodeModules
|
id: cacheNodeModules
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: '**/node_modules'
|
path: "**/node_modules"
|
||||||
key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
|
key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
|
||||||
restore-keys: ${{ runner.os }}-cacheNodeModules3-
|
restore-keys: ${{ runner.os }}-cacheNodeModules3-
|
||||||
- name: Get yarn cache directory path
|
- name: Get yarn cache directory path
|
||||||
|
@ -562,7 +562,7 @@ jobs:
|
||||||
run: yarn --frozen-lockfile --network-timeout 180000
|
run: yarn --frozen-lockfile --network-timeout 180000
|
||||||
|
|
||||||
- name: Compile and Download
|
- 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)
|
- name: Run Unit Tests (Electron)
|
||||||
run: .\scripts\test.bat
|
run: .\scripts\test.bat
|
||||||
|
@ -589,7 +589,7 @@ jobs:
|
||||||
id: cacheNodeModules
|
id: cacheNodeModules
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: '**/node_modules'
|
path: "**/node_modules"
|
||||||
key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
|
key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
|
||||||
restore-keys: ${{ runner.os }}-cacheNodeModules3-
|
restore-keys: ${{ runner.os }}-cacheNodeModules3-
|
||||||
- name: Get yarn cache directory path
|
- name: Get yarn cache directory path
|
||||||
|
@ -611,7 +611,7 @@ jobs:
|
||||||
run: yarn --frozen-lockfile --network-timeout 180000
|
run: yarn --frozen-lockfile --network-timeout 180000
|
||||||
|
|
||||||
- name: Compile and Download
|
- 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)
|
- name: Run Unit Tests (Electron)
|
||||||
run: DISPLAY=:10 ./scripts/test.sh
|
run: DISPLAY=:10 ./scripts/test.sh
|
||||||
|
@ -638,7 +638,7 @@ jobs:
|
||||||
id: cacheNodeModules
|
id: cacheNodeModules
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: '**/node_modules'
|
path: "**/node_modules"
|
||||||
key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
|
key: ${{ runner.os }}-cacheNodeModules3-${{ hashFiles('.yarnrc', 'remote/.yarnrc', '**/yarn.lock', '!**/node_modules/**/yarn.lock', '!**/.*/**/yarn.lock') }}
|
||||||
restore-keys: ${{ runner.os }}-cacheNodeModules3-
|
restore-keys: ${{ runner.os }}-cacheNodeModules3-
|
||||||
- name: Execute yarn
|
- name: Execute yarn
|
||||||
|
|
|
@ -45,7 +45,8 @@
|
||||||
"compile-web": "gulp compile-web --max_old_space_size=4095",
|
"compile-web": "gulp compile-web --max_old_space_size=4095",
|
||||||
"watch-web": "gulp watch-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",
|
"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": {
|
"dependencies": {
|
||||||
"applicationinsights": "1.0.8",
|
"applicationinsights": "1.0.8",
|
||||||
|
|
Loading…
Reference in a new issue