Wait for tasks loaded & cleanup

microsoft · May 18, 2020 · 85acf14 · 85acf14
1 parent 5851c2e
commit 85acf14
Show file tree

Hide file tree

Showing 15 changed files with 397 additions and 1,070 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -45,7 +45,7 @@ jobs:
       matrix:
         node-version: [12.16.2]
         java-version: ['8', '11']
-        os: [macos-latest]
+        os: [ubuntu-latest, windows-latest] # unable to test on macos-latest, see https://github.com/microsoft/vscode/issues/98080
     steps:
       - uses: actions/checkout@v1
       - name: Use Node ${{ matrix.node-version }}
@@ -66,10 +66,6 @@ jobs:
         with:
           name: lib
           path: extension/lib
-      - name: MacOS fix
-        run: |
-          export NODE_OPTIONS="--no-force-async-hooks-checks"
-        if: matrix.os == 'macos-latest'
       - name: Start Xvfb
         run: |
           Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
@@ -79,11 +75,28 @@ jobs:
           chmod +x extension/lib/tasks-server
           unset npm_config_prefix
         if: matrix.os != 'windows-latest'
+      - name: Prepare gradle-groovy-custom-build-file
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: build
+          build-root-directory: extension/test-fixtures/gradle-groovy-custom-build-file
+          wrapper-directory: extension/test-fixtures/gradle-groovy-custom-build-file
+      - name: Prepare gradle-groovy-default-build-file
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: build
+          build-root-directory: extension/test-fixtures/gradle-groovy-default-build-file
+          wrapper-directory: extension/test-fixtures/gradle-groovy-default-build-file
+      - name: Prepare gradle-kotlin-default-build-file
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: build
+          build-root-directory: extension/test-fixtures/gradle-kotlin-default-build-file
+          wrapper-directory: extension/test-fixtures/gradle-kotlin-default-build-file
       - name: Test extension
         uses: eskatos/gradle-command-action@v1
         with:
           arguments: testVsCode
         env:
           DISPLAY: ':99.0'
           CI: 'true'
-          NODE_OPTIONS: '--no-force-async-hooks-checks'
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -9,7 +9,7 @@
       "windows": {
         "command": ".\\gradlew.bat"
       },
-      "args": ["build", "-x", "test"],
+      "args": ["build", "-x", "test", "-x", "npm-package:build"],
       "isBackground": true,
       "presentation": {
         "reveal": "always"