From a4ac863861b290821e5a887158bee11eb83e480a Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 13:15:50 +0200 Subject: [PATCH 01/19] Scaffold pipeline --- build/pipeline.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 build/pipeline.yml diff --git a/build/pipeline.yml b/build/pipeline.yml new file mode 100644 index 0000000..adcc3b3 --- /dev/null +++ b/build/pipeline.yml @@ -0,0 +1,38 @@ +name: $(Date:yyyyMMdd)$(Rev:.r) + +trigger: + branches: + include: + - main + tags: + include: ['*'] +pr: none + +resources: + repositories: + - repository: templates + type: github + name: microsoft/vscode-engineering + ref: main + endpoint: Monaco + +parameters: + - name: publishPackage + displayName: 🚀 Publish Package + type: boolean + default: false + +extends: + template: azure-pipelines/npm-package/pipeline.yml@templates + parameters: + buildSteps: + - script: | + yarn --froze-lockfile + yarn --cwd=fs-provider --froze-lockfile + yarn --cwd=sample --froze-lockfile + displayName: Install dependencies + + - script: yarn compile + displayName: Compile npm package + + publishPackage: ${{ parameters.publishPackage }} From 6a3d220e0cdbee3c9b2307314fb6f72a02dcc743 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 13:21:24 +0200 Subject: [PATCH 02/19] Ignore build folder --- .npmignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.npmignore b/.npmignore index c24265d..8f30275 100644 --- a/.npmignore +++ b/.npmignore @@ -4,6 +4,7 @@ .eslintrc.js .prettierrc .github/ +build/ src/ sample/ fs-provider/src/ From dd872a797ff0f0a38949acffcbb74263081a53c3 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 13:24:31 +0200 Subject: [PATCH 03/19] Add test steps --- build/pipeline.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/pipeline.yml b/build/pipeline.yml index adcc3b3..4f61806 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -35,4 +35,8 @@ extends: - script: yarn compile displayName: Compile npm package + testSteps: + - script: yarn sample-tests + displayName: Test npm package + publishPackage: ${{ parameters.publishPackage }} From c18e88f21bf0f598fe5e49286c56939da2a5cf43 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 13:31:49 +0200 Subject: [PATCH 04/19] Try running browser headless --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f888c24..f54927d 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "compile-fs-provider": "yarn --cwd=fs-provider compile-web", "compile-sample": "yarn --cwd=sample compile-web", "sample": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample sample/test-workspace", - "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --headless=false sample/test-workspace", + "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --headless=true sample/test-workspace", "empty": "npm run compile && node ." }, "main": "./out/index.js", From 5f4d944afa52957ed0043f0f718bb3df466d4223 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 13:48:22 +0200 Subject: [PATCH 05/19] Do not run headless --- build/pipeline.yml | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build/pipeline.yml b/build/pipeline.yml index 4f61806..434daf6 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -36,7 +36,14 @@ extends: displayName: Compile npm package testSteps: + - bash: | + /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & + echo ">>> Started xvfb" + displayName: Start xvfb + - script: yarn sample-tests displayName: Test npm package + env: + DISPLAY: ':99.0' publishPackage: ${{ parameters.publishPackage }} diff --git a/package.json b/package.json index f54927d..f888c24 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "compile-fs-provider": "yarn --cwd=fs-provider compile-web", "compile-sample": "yarn --cwd=sample compile-web", "sample": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample sample/test-workspace", - "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --headless=true sample/test-workspace", + "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --headless=false sample/test-workspace", "empty": "npm run compile && node ." }, "main": "./out/index.js", From a392ef207a85e27c28817463c6725d299dc11a23 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 15:09:07 +0200 Subject: [PATCH 06/19] Add build platforms --- build/pipeline.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/build/pipeline.yml b/build/pipeline.yml index 434daf6..df2d840 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -25,6 +25,20 @@ parameters: extends: template: azure-pipelines/npm-package/pipeline.yml@templates parameters: + buildPlatforms: + - name: Linux + nodeVersions: + - 14.x + - 16.x + - name: MacOS + nodeVersions: + - 14.x + - 16.x + - name: Windows + nodeVersions: + - 14.x + - 16.x + buildSteps: - script: | yarn --froze-lockfile From bd4a0d966e55c299a53ea01e68a308e70b55dd2b Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 15:18:39 +0200 Subject: [PATCH 07/19] Try running headless --- build/pipeline.yml | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/pipeline.yml b/build/pipeline.yml index df2d840..7682caf 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -50,14 +50,14 @@ extends: displayName: Compile npm package testSteps: - - bash: | - /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - echo ">>> Started xvfb" - displayName: Start xvfb + # - bash: | + # /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & + # echo ">>> Started xvfb" + # displayName: Start xvfb - script: yarn sample-tests displayName: Test npm package - env: - DISPLAY: ':99.0' + # env: + # DISPLAY: ':99.0' publishPackage: ${{ parameters.publishPackage }} diff --git a/package.json b/package.json index f888c24..f54927d 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "compile-fs-provider": "yarn --cwd=fs-provider compile-web", "compile-sample": "yarn --cwd=sample compile-web", "sample": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample sample/test-workspace", - "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --headless=false sample/test-workspace", + "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --headless=true sample/test-workspace", "empty": "npm run compile && node ." }, "main": "./out/index.js", From 2722a82a0461ff984f95ae09797d7ea39c88ba42 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 15:33:18 +0200 Subject: [PATCH 08/19] Fixing some issues for Windows --- build/pipeline.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build/pipeline.yml b/build/pipeline.yml index 7682caf..3f6287d 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -40,12 +40,12 @@ extends: - 16.x buildSteps: - - script: | - yarn --froze-lockfile - yarn --cwd=fs-provider --froze-lockfile - yarn --cwd=sample --froze-lockfile + - script: yarn --froze-lockfile displayName: Install dependencies + - script: yarn --cwd=fs-provider --froze-lockfile + displayName: Install dependencies (fs-provider) + - script: yarn compile displayName: Compile npm package @@ -55,6 +55,9 @@ extends: # echo ">>> Started xvfb" # displayName: Start xvfb + - script: yarn --cwd=sample --froze-lockfile + displayName: Install dependencies (sample) + - script: yarn sample-tests displayName: Test npm package # env: From 63f69a95a2f276d106ddcf75ecad6e0691cc472e Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 15:34:03 +0200 Subject: [PATCH 09/19] Only run on Windows --- build/pipeline.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/pipeline.yml b/build/pipeline.yml index 3f6287d..92e6d77 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -26,14 +26,14 @@ extends: template: azure-pipelines/npm-package/pipeline.yml@templates parameters: buildPlatforms: - - name: Linux - nodeVersions: - - 14.x - - 16.x - - name: MacOS - nodeVersions: - - 14.x - - 16.x + # - name: Linux + # nodeVersions: + # - 14.x + # - 16.x + # - name: MacOS + # nodeVersions: + # - 14.x + # - 16.x - name: Windows nodeVersions: - 14.x From a4295df2045fba4699b0275b87d0b2db8f435847 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 15:41:49 +0200 Subject: [PATCH 10/19] Remove headless flag --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f54927d..2b2dbac 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "compile-fs-provider": "yarn --cwd=fs-provider compile-web", "compile-sample": "yarn --cwd=sample compile-web", "sample": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample sample/test-workspace", - "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --headless=true sample/test-workspace", + "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js sample/test-workspace", "empty": "npm run compile && node ." }, "main": "./out/index.js", From 9fcc1fde7ce3811ce2f7da55b2d9bbff676ed0e7 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:07:06 +0200 Subject: [PATCH 11/19] Upgrade Playwright --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 2b2dbac..db9e809 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "koa-mount": "^4.0.0", "koa-static": "^5.0.0", "minimist": "^1.2.6", - "playwright": "^1.23.1", + "playwright": "^1.26.1", "vscode-uri": "^3.0.3", "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.1", diff --git a/yarn.lock b/yarn.lock index ff3ce99..92836b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1478,17 +1478,17 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= -playwright-core@1.23.1: - version "1.23.1" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.23.1.tgz#af02bd7568af1017e477433b1b003ba84e1eb312" - integrity sha512-9CXsE0gawph4KXl6oUaa0ehHRySZjHvly4TybcBXDvzK3N3o6L/eZ8Q6iVWUiMn0LLS5bRFxo1qEtOETlYJxjw== +playwright-core@1.26.1: + version "1.26.1" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.26.1.tgz#a162f476488312dcf12638d97685144de6ada512" + integrity sha512-hzFchhhxnEiPc4qVPs9q2ZR+5eKNifY2hQDHtg1HnTTUuphYCBP8ZRb2si+B1TR7BHirgXaPi48LIye5SgrLAA== -playwright@^1.23.1: - version "1.23.1" - resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.23.1.tgz#b029885e995aa1f9626aac851410c5ef615718f4" - integrity sha512-+lgiy1JZMNPwpBp5tsUdjTGxuJ+lXZbtSKmMDc0/f1oVsNDXXA+r7zeC9Kzd+4jSHteoJJocargxVx2Mn1o2kw== +playwright@^1.26.1: + version "1.26.1" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.26.1.tgz#0082c1d6a1c9cefe3f7a593396ad8568746184d0" + integrity sha512-WQmEdCgYYe8jOEkhkW9QLcK0PB+w1RZztBLYIT10MEEsENYg251cU0IzebDINreQsUt+HCwwRhtdz4weH9ICcQ== dependencies: - playwright-core "1.23.1" + playwright-core "1.26.1" prelude-ls@^1.2.1: version "1.2.1" From cb7e7f0c6df431b1a0157ae16548e0fcec5b2a68 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:07:28 +0200 Subject: [PATCH 12/19] Add back the platforms --- build/pipeline.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/pipeline.yml b/build/pipeline.yml index 92e6d77..3f6287d 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -26,14 +26,14 @@ extends: template: azure-pipelines/npm-package/pipeline.yml@templates parameters: buildPlatforms: - # - name: Linux - # nodeVersions: - # - 14.x - # - 16.x - # - name: MacOS - # nodeVersions: - # - 14.x - # - 16.x + - name: Linux + nodeVersions: + - 14.x + - 16.x + - name: MacOS + nodeVersions: + - 14.x + - 16.x - name: Windows nodeVersions: - 14.x From 4f55e7cdb14c205ab9dde222646dd82469df0487 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:16:24 +0200 Subject: [PATCH 13/19] Bring back the --headless flag --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index db9e809..39f22cb 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "compile-fs-provider": "yarn --cwd=fs-provider compile-web", "compile-sample": "yarn --cwd=sample compile-web", "sample": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample sample/test-workspace", - "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js sample/test-workspace", + "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --headless=true sample/test-workspace", "empty": "npm run compile && node ." }, "main": "./out/index.js", From a3589403175c31ff87f63cdcd57f1b133a5fdd51 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:26:42 +0200 Subject: [PATCH 14/19] Try a conditional task --- build/pipeline.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/build/pipeline.yml b/build/pipeline.yml index 3f6287d..cccf311 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -50,17 +50,19 @@ extends: displayName: Compile npm package testSteps: - # - bash: | - # /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - # echo ">>> Started xvfb" - # displayName: Start xvfb + - ${{ if eq(parameters.jobPlatformName, 'Linux') }}: + - bash: | + /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & + echo ">>> Started xvfb" + displayName: Start xvfb - script: yarn --cwd=sample --froze-lockfile displayName: Install dependencies (sample) - script: yarn sample-tests displayName: Test npm package - # env: - # DISPLAY: ':99.0' + ${{ if eq(parameters.jobPlatformName, 'Linux') }}: + env: + DISPLAY: ':99.0' publishPackage: ${{ parameters.publishPackage }} From 49ff76973ffbff5fe84f17a5067b4dc525d05fdc Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:29:24 +0200 Subject: [PATCH 15/19] Revert the flag --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 39f22cb..f27c406 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "compile-fs-provider": "yarn --cwd=fs-provider compile-web", "compile-sample": "yarn --cwd=sample compile-web", "sample": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample sample/test-workspace", - "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --headless=true sample/test-workspace", + "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --headless=false sample/test-workspace", "empty": "npm run compile && node ." }, "main": "./out/index.js", From 0a0a45e2320e775e737a56ab8438b6df8c99afac Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 18:44:34 +0200 Subject: [PATCH 16/19] Switch to a predefined variable --- build/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/pipeline.yml b/build/pipeline.yml index cccf311..472224a 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -50,7 +50,7 @@ extends: displayName: Compile npm package testSteps: - - ${{ if eq(parameters.jobPlatformName, 'Linux') }}: + - ${{ if eq(variables['Agent.OS'], 'Linux') }}: - bash: | /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & echo ">>> Started xvfb" @@ -61,7 +61,7 @@ extends: - script: yarn sample-tests displayName: Test npm package - ${{ if eq(parameters.jobPlatformName, 'Linux') }}: + ${{ if eq(variables['Agent.OS'], 'Linux') }}: env: DISPLAY: ':99.0' From 8c7973cf99336e8a5ec1523d07acf6e76b9d7d07 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 18:55:49 +0200 Subject: [PATCH 17/19] Trying various things --- build/pipeline.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/build/pipeline.yml b/build/pipeline.yml index 472224a..6b077f8 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -30,14 +30,14 @@ extends: nodeVersions: - 14.x - 16.x - - name: MacOS - nodeVersions: - - 14.x - - 16.x - - name: Windows - nodeVersions: - - 14.x - - 16.x + # - name: MacOS + # nodeVersions: + # - 14.x + # - 16.x + # - name: Windows + # nodeVersions: + # - 14.x + # - 16.x buildSteps: - script: yarn --froze-lockfile @@ -56,6 +56,11 @@ extends: echo ">>> Started xvfb" displayName: Start xvfb + - script: echo $(Agent.OS) + + - script: echo $(Agent.OS) + condition: eq(variables['Agent.OS'], 'Linux') + - script: yarn --cwd=sample --froze-lockfile displayName: Install dependencies (sample) From 5af2f570281de9122dab6000b8fa6f91fbe373ce Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 19:00:00 +0200 Subject: [PATCH 18/19] Add back a platform --- build/pipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pipeline.yml b/build/pipeline.yml index 6b077f8..33a6763 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -34,10 +34,10 @@ extends: # nodeVersions: # - 14.x # - 16.x - # - name: Windows - # nodeVersions: - # - 14.x - # - 16.x + - name: Windows + nodeVersions: + - 14.x + - 16.x buildSteps: - script: yarn --froze-lockfile From e3baa3600395a5da0bc76029cabeb4e7a5db5265 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 5 Oct 2022 19:20:41 +0200 Subject: [PATCH 19/19] Another attempt --- build/pipeline.yml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/build/pipeline.yml b/build/pipeline.yml index 33a6763..ed7ed6e 100644 --- a/build/pipeline.yml +++ b/build/pipeline.yml @@ -30,10 +30,10 @@ extends: nodeVersions: - 14.x - 16.x - # - name: MacOS - # nodeVersions: - # - 14.x - # - 16.x + - name: MacOS + nodeVersions: + - 14.x + - 16.x - name: Windows nodeVersions: - 14.x @@ -50,15 +50,10 @@ extends: displayName: Compile npm package testSteps: - - ${{ if eq(variables['Agent.OS'], 'Linux') }}: - - bash: | - /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - echo ">>> Started xvfb" - displayName: Start xvfb - - - script: echo $(Agent.OS) - - - script: echo $(Agent.OS) + - bash: | + /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & + echo ">>> Started xvfb" + displayName: Start xvfb condition: eq(variables['Agent.OS'], 'Linux') - script: yarn --cwd=sample --froze-lockfile @@ -66,8 +61,7 @@ extends: - script: yarn sample-tests displayName: Test npm package - ${{ if eq(variables['Agent.OS'], 'Linux') }}: - env: - DISPLAY: ':99.0' + env: + DISPLAY: ':99.0' publishPackage: ${{ parameters.publishPackage }}