Merge branch 'main' into renovate/actions-checkout-4.x

googleapis · Oct 5, 2023 · 97f7db0 · 97f7db0
2 parents f6b8b98 + eab0ce8
commit 97f7db0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -5,3 +5,4 @@ build/
 docs/
 protos/
 samples/generated/
+system-test/**/fixtures
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest
-  digest: sha256:e08f9a3757808cdaf7a377e962308c65c4d7eff12db206d4fae702dd50d43430
-# created: 2023-08-03T18:46:14.719706948Z
+  digest: sha256:abc68a9bbf4fa808b25fa16d3b11141059dc757dbc34f024744bba36c200b40f
+# created: 2023-10-04T20:56:40.710775365Z
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -7,7 +7,6 @@ branchProtectionRules:
     requiredStatusCheckContexts:
       - "ci/kokoro: Samples test"
       - "ci/kokoro: System test"
-      - docs
       - lint
       - test (14)
       - test (16)

diff --git a/package.json b/package.json
@@ -42,6 +42,7 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@compodoc/compodoc": "^1.1.9",
     "@types/execa": "^0.9.0",
     "@types/extend": "^3.0.1",
@@ -52,7 +53,7 @@
     "@types/proxyquire": "^1.3.28",
     "@types/qs": "^6.5.3",
     "@types/sinon": "^10.0.0",
-    "@types/tmp": "0.2.3",
+    "@types/tmp": "0.2.4",
     "@types/url-template": "^2.0.28",
     "@types/uuid": "^9.0.0",
     "c8": "^8.0.0",

diff --git a/src/http2.ts b/src/http2.ts
@@ -38,7 +38,7 @@ const DEBUG = !!process.env.HTTP2_DEBUG;
  */
 export interface SessionData {
   session: http2.ClientHttp2Session;
-  timeoutHandle?: NodeJS.Timer;
+  timeoutHandle?: NodeJS.Timeout;
 }
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ build/ @@
     docs/
     protos/
     samples/generated/
+    system-test/**/fixtures