Merge branch 'master' into rmuller/better-errors-reutrning-this-from-…

…internal-type

.gitattributes

@@ -14,4 +14,5 @@
 
 # Github Linguist configuration (https://github.com/github/linguist)
 yarn.lock linguidt-generated
+*.snap    linguist-generated
 docs/**   linguist-documentation

.github/workflows/main.yml

@@ -44,8 +44,11 @@ jobs:
       - name: Locate Caches
         id: cache-locations
         run: |-
+          echo "::group::Upgrade pip"
           # Need to have PIP >= 20.1 for "pip cache dir" to work
           python3 -m pip install --upgrade pip
+          echo "::endgroup"
+
           echo "::set-output name=pip-cache::$(python3 -m pip cache dir)"
           echo "::set-output name=yarn-cache::$(yarn cache dir)"
       - name: Cache
@@ -63,18 +66,26 @@ jobs:
             ${{ runner.os }}-
       # Prepare dependencies and build
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: |-
+          yarn install --frozen-lockfile
       - name: Full Build
-        run: yarn build
-      - name: "Upload Artifact: built-tree"
+        run: |-
+          yarn build
+      - name: Prepare Artifact
+        run: |-
+          tar Jcvf ${{ runner.temp }}/built-tree.tar.xz                         \
+            --exclude='**/.env'                                                 \
+            --exclude='**/node_modules'                                         \
+            --exclude='**/project/.m2/repository'                               \
+            --exclude-tag-all='pyenv.cfg'                                       \
+            --directory=${{ github.workspace }}                                 \
+            .
+      # Upload artifact (we'll tar it up to save time)
+      - name: 'Upload Artifact: built-tree'
         uses: actions/upload-artifact@v2
         with:
           name: built-tree
-          path: |-
-            ${{ github.workspace }}
-            !**/.env/**
-            !**/node_modules/**
-            !**/project/.m2/**
+          path: ${{ runner.temp }}/built-tree.tar.xz
 
   create-release-package:
     name: Create Release Package
@@ -104,8 +115,11 @@ jobs:
       - name: Locate Caches
         id: cache-locations
         run: |-
+          echo "::group::Upgrade pip"
           # Need to have PIP >= 20.1 for "pip cache dir" to work
           python3 -m pip install --upgrade pip
+          echo "::endgroup"
+
           echo "::set-output name=pip-cache::$(python3 -m pip cache dir)"
           echo "::set-output name=yarn-cache::$(yarn cache dir)"
       - name: Cache
@@ -140,17 +154,22 @@ jobs:
             --prerelease=nightly.$(date -u +'%Y%m%d')                                                                   \
             --skip.commit
       # Now we'll be preparing a release package (with the "real" version)
-      - name: Align Versions
-        run: ./scripts/align-version.sh
+      - name: Run "align-version.sh"
+        run: |-
+          ./scripts/align-version.sh
       - name: Full Build
-        run: yarn build
-      - name: Package Libraries
-        run: yarn package
-      - name: "Upload Artifact: release-package"
+        run: |-
+          yarn build
+      - name: Package
+        run: |-
+          yarn package
+      # Upload artifacts
+      - name: 'Upload Artifact: release-package'
         uses: actions/upload-artifact@v2
         with:
           name: release-package
           path: ${{ github.workspace }}/dist/
+
   test:
     name: Test (${{ matrix.os }} / java ${{ matrix.java }} / node ${{ matrix.node }} / python ${{ matrix.python }})
     needs: build
@@ -226,11 +245,27 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: built-tree
+      # Put GitBash ahead of $PATH, so we avoid surprises due to bad tar, etc...
+      # (technically a hack around https://github.com/actions/virtual-environments/issues/282)
+      - name: 'Windows: Put GitBash ahead of $PATH'
+        if: runner.os == 'Windows'
+        run: |-
+          echo "::add-path::C:\Program Files\Git\usr\bin"
+      - name: Extract Artifact
+        run: |-
+          echo "::group::Untar Archive"
+          tar Jxvf built-tree.tar.xz
+          echo "::endgroup"
+
+          rm built-tree.tar.xz
       - name: Locate Caches
         id: cache-locations
         run: |-
+          echo "::group::Upgrade pip"
           # Need to have PIP >= 20.1 for "pip cache dir" to work
           python3 -m pip install --upgrade pip
+          echo "::endgroup"
+
           echo "::set-output name=pip-cache::$(python3 -m pip cache dir)"
           echo "::set-output name=yarn-cache::$(yarn cache dir)"
       - name: Cache
@@ -247,9 +282,10 @@ jobs:
             ${{ runner.os }}-node@${{ matrix.node }}-python@${{ matrix.python }}-
             ${{ runner.os }}-node@${{ matrix.node }}-
             ${{ runner.os }}-
-      # Install dependencies (ensures arch/os specific packages are re-built)
+      # Run the tests
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
-      # Run all tests
+        run: |-
+          yarn install --frozen-lockfile
       - name: Test
-        run: yarn test
+        run: |-
+          yarn test

.mergify.yml → .mergify/config.yml

@@ -31,6 +31,21 @@ pull_request_rules:
       - status-success~=AWS CodeBuild us-east-1
       - status-success=continuous-integration/travis-ci/pr
       - status-success=Semantic Pull Request
+      # One test for each OS
+      - status-success~=^Test \(ubuntu-.*$
+      - status-success~=^Test \(macos-.*$
+      - status-success~=^Test \(windows-.*$
+      # One test for each supported nodejs version
+      - status-success~=^Test \(.* node 10 .*$
+      - status-success~=^Test \(.* node 12 .*$
+      - status-success~=^Test \(.* node 14 .*$
+      # One test for Java 8 and 11
+      - status-success~=^Test \(.* java 8 .*$
+      - status-success~=^Test \(.* java 11 .*$
+      # One test for Python 3.6, 3.7, and 3.8
+      - status-success~=^Test \(.* python 3\.6 .*$
+      - status-success~=^Test \(.* python 3\.7 .*$
+      - status-success~=^Test \(.* python 3\.8 .*$
 
   - name: Synchronize that PR to upstream and merge it (squash)
     actions:
@@ -61,6 +76,21 @@ pull_request_rules:
       - status-success~=AWS CodeBuild us-east-1
       - status-success=continuous-integration/travis-ci/pr
       - status-success=Semantic Pull Request
+      # One test for each OS
+      - status-success~=^Test \(ubuntu-.*$
+      - status-success~=^Test \(macos-.*$
+      - status-success~=^Test \(windows-.*$
+      # One test for each supported nodejs version
+      - status-success~=^Test \(.* node 10 .*$
+      - status-success~=^Test \(.* node 12 .*$
+      - status-success~=^Test \(.* node 14 .*$
+      # One test for Java 8 and 11
+      - status-success~=^Test \(.* java 8 .*$
+      - status-success~=^Test \(.* java 11 .*$
+      # One test for Python 3.6, 3.7, and 3.8
+      - status-success~=^Test \(.* python 3\.6 .*$
+      - status-success~=^Test \(.* python 3\.7 .*$
+      - status-success~=^Test \(.* python 3\.8 .*$
 
   - name: Synchronize that PR to upstream and merge it (no-squash)
     actions:
@@ -91,6 +121,21 @@ pull_request_rules:
       - status-success~=AWS CodeBuild us-east-1
       - status-success=continuous-integration/travis-ci/pr
       - status-success=Semantic Pull Request
+      # One test for each OS
+      - status-success~=^Test \(ubuntu-.*$
+      - status-success~=^Test \(macos-.*$
+      - status-success~=^Test \(windows-.*$
+      # One test for each supported nodejs version
+      - status-success~=^Test \(.* node 10 .*$
+      - status-success~=^Test \(.* node 12 .*$
+      - status-success~=^Test \(.* node 14 .*$
+      # One test for Java 8 and 11
+      - status-success~=^Test \(.* java 8 .*$
+      - status-success~=^Test \(.* java 11 .*$
+      # One test for Python 3.6, 3.7, and 3.8
+      - status-success~=^Test \(.* python 3\.6 .*$
+      - status-success~=^Test \(.* python 3\.7 .*$
+      - status-success~=^Test \(.* python 3\.8 .*$
 
   - name: Clean branch up
     actions:

package.json

@@ -10,9 +10,9 @@
     "dist-clean": "lerna run dist-clean --stream && rm -rf dist",
     "fetch-dotnet-snk": "bash scripts/fetch-dotnet-snk.sh",
     "package": "bash scripts/package.sh",
-    "test": "lerna run test --stream",
+    "test": "lerna run test --concurrency=1 --stream",
     "test:integ": "lerna run test:integ --stream",
-    "test:update": "lerna run test:update --stream"
+    "test:update": "lerna run test:update --concurrency=1 --stream"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^3.8.0",

packages/@jsii/dotnet-runtime-test/package.json

@@ -34,6 +34,6 @@
     "@types/node": "^10.17.28",
     "jsii-calc": "^0.0.0",
     "jsii-pacmak": "^0.0.0",
-    "typescript": "~3.9.6"
+    "typescript": "~3.9.7"
   }
 }

packages/@jsii/dotnet-runtime/package.json

@@ -43,6 +43,6 @@
     "@types/semver": "^7.3.1",
     "jsii-build-tools": "^0.0.0",
     "semver": "^7.3.2",
-    "typescript": "~3.9.6"
+    "typescript": "~3.9.7"
   }
 }

packages/@jsii/integ-test/package.json

@@ -36,7 +36,7 @@
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.4",
     "prettier": "^1.19.1",
-    "typescript": "~3.9.6"
+    "typescript": "~3.9.7"
   },
   "jest": {
     "errorOnDeprecated": true,

packages/@jsii/java-runtime/package.json

@@ -35,6 +35,6 @@
     "@jsii/runtime": "^0.0.0",
     "@types/node": "^10.17.28",
     "jsii-build-tools": "^0.0.0",
-    "typescript": "~3.9.6"
+    "typescript": "~3.9.7"
   }
 }

packages/@jsii/kernel/package.json

@@ -52,7 +52,7 @@
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^0.0.0",
     "prettier": "^1.19.1",
-    "typescript": "~3.9.6"
+    "typescript": "~3.9.7"
   },
   "jest": {
     "collectCoverage": true,

packages/@jsii/kernel/test/kernel.test.ts

@@ -76,27 +76,31 @@ defineTest.skip = function (
   return defineTest(name, method, test.skip);
 };
 
-test('load preserves file permissions', async () => {
-  // Changing the umask to 077 (which would neutralize group/other permissions)
-  const originalUmask = process.umask(0o077);
+// Note: this test asserts file permissions, which work differently on Windows, so we skip it there
+(process.platform === 'win32' ? test.skip : test)(
+  'load preserves file permissions',
+  async () => {
+    // Changing the umask to 077 (which would neutralize group/other permissions)
+    const originalUmask = process.umask(0o077);
 
-  try {
-    const kernel = await createCalculatorSandbox(
-      'load_preserves_file_permissions',
-    );
+    try {
+      const kernel = await createCalculatorSandbox(
+        'load_preserves_file_permissions',
+      );
 
-    const result = kernel.sinvoke({
-      fqn: 'jsii-calc.UmaskCheck',
-      method: 'mode',
-    });
-    expect(result.result).toBe(0o644);
+      const result = kernel.sinvoke({
+        fqn: 'jsii-calc.UmaskCheck',
+        method: 'mode',
+      });
+      expect(result.result).toBe(0o644);
 
-    return closeRecording(kernel);
-  } finally {
-    // Restore the original umask
-    process.umask(originalUmask);
-  }
-});
+      return closeRecording(kernel);
+    } finally {
+      // Restore the original umask
+      process.umask(originalUmask);
+    }
+  },
+);
 
 defineTest('stats() return sandbox statistics', (sandbox) => {
   const stats = sandbox.stats({});