Merge branch '25.lts.1+' into cherry-pick-25.lts.1+-3123

.github/CODEOWNERS

@@ -5,18 +5,16 @@
 # For the full docs on CODEOWNERS, see:
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-# Disable everything on working feature branch.
-
 # Metrics owners
-# /cobalt/browser/metrics/ @joeltine
-# /components/metrics/ @joeltine
-# /tools/metrics/ @joeltine
+/cobalt/browser/metrics/ @joeltine
+/components/metrics/ @joeltine
+/tools/metrics/ @joeltine
 
-# Temporary monitoring for merges to Chromium upstreams
-# /base/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
-# /build/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
-# /crypto/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
-# /net/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
-# /third_party/abseil-cpp/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
-# /third_party/modp_b64/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
-# /url/ @andrewsavage1 @youtube/cobalt-3p-repository-owners
+# Monitoring for merges to Chromium upstreams
+/base/ @youtube/cobalt-3p-repository-owners
+/build/ @youtube/cobalt-3p-repository-owners
+/crypto/ @youtube/cobalt-3p-repository-owners
+/net/ @youtube/cobalt-3p-repository-owners
+/third_party/abseil-cpp/ @youtube/cobalt-3p-repository-owners
+/third_party/modp_b64/ @youtube/cobalt-3p-repository-owners
+/url/ @youtube/cobalt-3p-repository-owners

.github/workflows/main.yaml

@@ -74,6 +74,7 @@ jobs:
         github.event.label.name == 'runtest' ||
         github.event.label.name == 'on_device'
       )
+    timeout-minutes: 10
     steps:
       - id: checkout
         uses: kaidokert/[email protected]
@@ -148,6 +149,7 @@ jobs:
     runs-on: [self-hosted, linux-runner]
     permissions:
       packages: write
+    timeout-minutes: 30
     steps:
       - name: Checkout files
         uses: kaidokert/[email protected]
@@ -184,6 +186,7 @@ jobs:
     permissions:
       packages: write
     runs-on: [self-hosted, linux-runner]
+    timeout-minutes: 30
     steps:
       - name: Checkout files
         uses: kaidokert/[email protected]
@@ -231,6 +234,7 @@ jobs:
       # However, dind container ends up having / folder mounted on overlay
       # filesystem, whereas /__w which contains Cobalt source code is on tmpfs.
       TMPDIR: /__w/_temp
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: kaidokert/[email protected]
@@ -367,6 +371,7 @@ jobs:
       HOME: /root
       COBALT_EVERGREEN_LOADER: ${{needs.initialize.outputs.evergreen_loader}}
       MODULAR_BUILD: ${{ inputs.modular && 1 || 0 }}
+    timeout-minutes: 90
     steps:
       - name: Checkout
         uses: kaidokert/[email protected]

.github/workflows/main_win.yaml

@@ -61,6 +61,7 @@ jobs:
         github.event.label.name == 'runtest' ||
         github.event.label.name == 'on_device'
       )
+    timeout-minutes: 10
     steps:
       - id: Checkout
         uses: kaidokert/[email protected] # Temporary version
@@ -133,6 +134,7 @@ jobs:
     permissions:
       packages: write
     runs-on: windows-2019
+    timeout-minutes: 120
     steps:
       - name: Checkout files
         uses: kaidokert/[email protected]
@@ -167,6 +169,7 @@ jobs:
         platform: ${{ fromJson(needs.initialize.outputs.platforms) }}
         include: ${{ fromJson(needs.initialize.outputs.includes) }}
         config: [devel, debug, qa, gold]
+    timeout-minutes: 90
     steps:
       - name: Checkout
         uses: kaidokert/[email protected]
@@ -204,6 +207,7 @@ jobs:
         include: ${{ fromJson(needs.initialize.outputs.includes) }}
     env:
       MODULAR_BUILD: ${{ inputs.modular && 1 || 0 }}
+    timeout-minutes: 90
     steps:
       - name: Checkout
         uses: kaidokert/[email protected]

.github/workflows/pytest_25.lts.1+.yaml

@@ -20,6 +20,7 @@ jobs:
         python-version: ['3.8', '3.11']
       fail-fast: false
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
     steps:
       - name: Checkout
         uses: kaidokert/[email protected]

.pre-commit-config.yaml

@@ -11,7 +11,6 @@ files: |
             .github|
             cobalt|
             docker|
-            glimp|
             internal|
             precommit_hooks|
             starboard|
@@ -25,8 +24,8 @@ exclude: |
     (?x)^(
         (
             cobalt/updater|
-            glimp/include|
             internal/kokoro/third-party|
+            internal/starboard/shared/glimp/include|
             internal/starboard/shared/playstation/glimp/shaders|
         )/
         |
@@ -147,7 +146,7 @@ repos:
                 cobalt/websocket/|
                 components/crx_file/|
                 content/|
-                glimp/|
+                internal/starboard/shared/glimp/|
                 nb/|
                 starboard/android/apk/gradlew|
                 starboard/android/apk/app/src/main/java/dev/cobalt/media/MediaDrmBridge.java$|