Merge branch 'main' into otel-4

feywind · Oct 16, 2023 · 8649123 · 8649123
2 parents 6512ace + 4567d85
commit 8649123
Show file tree

Hide file tree

Showing 12 changed files with 2,829 additions and 166 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:606f3d9d99a1c7cdfa7158cbb1a75bfeef490655e246a2052f9ee741740d736c
-# created: 2023-08-17T19:15:55.176034173Z
+  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/owlbot.py b/owlbot.py
@@ -38,7 +38,7 @@
 )
 logger.debug("Running fix...")
 shell.run(
-    [f"/synthtool/node_modules/.bin/gts", "fix"],
+    ["npm", "run", "fix"],
     check=False,
 )
 

diff --git a/protos/protos.d.ts b/protos/protos.d.ts
diff --git a/protos/protos.js b/protos/protos.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ build/ @@
     docs/
     protos/
     samples/generated/
+    system-test/**/fixtures