Skip to content

Commit f1476ab

Browse files
author
snowzlm
committed
Merge latest main into PR 90212
2 parents 881ce6d + e8cf6df commit f1476ab

382 files changed

Lines changed: 31483 additions & 5719 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2093,15 +2093,15 @@ jobs:
20932093
uses: actions/cache@v5
20942094
with:
20952095
path: ~/.android-sdk
2096-
key: ${{ runner.os }}-android-sdk-v1-cmdline-12266719-platform-36-build-tools-36.0.0
2096+
key: ${{ runner.os }}-android-sdk-v1-cmdline-14742923-platform-37.0-build-tools-36.0.0
20972097
restore-keys: |
20982098
${{ runner.os }}-android-sdk-v1-
20992099
21002100
- name: Setup Android SDK cmdline-tools
21012101
run: |
21022102
set -euo pipefail
21032103
ANDROID_SDK_ROOT="$HOME/.android-sdk"
2104-
CMDLINE_TOOLS_VERSION="12266719"
2104+
CMDLINE_TOOLS_VERSION="14742923"
21052105
ARCHIVE="commandlinetools-linux-${CMDLINE_TOOLS_VERSION}_latest.zip"
21062106
URL="https://dl.google.com/android/repository/${ARCHIVE}"
21072107
@@ -2123,7 +2123,7 @@ jobs:
21232123
yes | sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --licenses >/dev/null
21242124
sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --install \
21252125
"platform-tools" \
2126-
"platforms;android-36" \
2126+
"platforms;android-37.0" \
21272127
"build-tools;36.0.0"
21282128
21292129
- name: Run Android ${{ matrix.task }}

.github/workflows/codeql-android-critical-security.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
java-version: "21"
3636

3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
38+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
3939
with:
4040
languages: java-kotlin
4141
build-mode: manual
@@ -46,6 +46,6 @@ jobs:
4646
run: ./gradlew --no-daemon :app:assemblePlayDebug
4747

4848
- name: Analyze
49-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
49+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
5050
with:
5151
category: "/codeql-critical-security/android"

.github/workflows/codeql-critical-quality.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -342,13 +342,13 @@ jobs:
342342
submodules: false
343343

344344
- name: Initialize CodeQL
345-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
345+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
346346
with:
347347
languages: javascript-typescript
348348
config-file: ./.github/codeql/codeql-core-auth-secrets-critical-quality.yml
349349

350350
- name: Analyze
351-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
351+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
352352
with:
353353
category: "/codeql-critical-quality/core-auth-secrets"
354354

@@ -365,13 +365,13 @@ jobs:
365365
submodules: false
366366

367367
- name: Initialize CodeQL
368-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
368+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
369369
with:
370370
languages: javascript-typescript
371371
config-file: ./.github/codeql/codeql-config-boundary-critical-quality.yml
372372

373373
- name: Analyze
374-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
374+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
375375
with:
376376
category: "/codeql-critical-quality/config-boundary"
377377

@@ -388,13 +388,13 @@ jobs:
388388
submodules: false
389389

390390
- name: Initialize CodeQL
391-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
391+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
392392
with:
393393
languages: javascript-typescript
394394
config-file: ./.github/codeql/codeql-gateway-runtime-boundary-critical-quality.yml
395395

396396
- name: Analyze
397-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
397+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
398398
with:
399399
category: "/codeql-critical-quality/gateway-runtime-boundary"
400400

@@ -411,13 +411,13 @@ jobs:
411411
submodules: false
412412

413413
- name: Initialize CodeQL
414-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
414+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
415415
with:
416416
languages: javascript-typescript
417417
config-file: ./.github/codeql/codeql-channel-runtime-boundary-critical-quality.yml
418418

419419
- name: Analyze
420-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
420+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
421421
with:
422422
category: "/codeql-critical-quality/channel-runtime-boundary"
423423

@@ -460,15 +460,15 @@ jobs:
460460
461461
- name: Initialize CodeQL
462462
if: ${{ github.event_name != 'pull_request' }}
463-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
463+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
464464
with:
465465
languages: javascript-typescript
466466
config-file: ./.github/codeql/codeql-network-runtime-boundary-critical-quality.yml
467467

468468
- name: Analyze
469469
id: analyze
470470
if: ${{ github.event_name != 'pull_request' }}
471-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
471+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
472472
with:
473473
output: sarif-results
474474
category: "/codeql-critical-quality/network-runtime-boundary"
@@ -518,13 +518,13 @@ jobs:
518518
submodules: false
519519

520520
- name: Initialize CodeQL
521-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
521+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
522522
with:
523523
languages: javascript-typescript
524524
config-file: ./.github/codeql/codeql-agent-runtime-boundary-critical-quality.yml
525525

526526
- name: Analyze
527-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
527+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
528528
with:
529529
category: "/codeql-critical-quality/agent-runtime-boundary"
530530

@@ -541,13 +541,13 @@ jobs:
541541
submodules: false
542542

543543
- name: Initialize CodeQL
544-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
544+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
545545
with:
546546
languages: javascript-typescript
547547
config-file: ./.github/codeql/codeql-mcp-process-runtime-boundary-critical-quality.yml
548548

549549
- name: Analyze
550-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
550+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
551551
with:
552552
category: "/codeql-critical-quality/mcp-process-runtime-boundary"
553553

@@ -564,13 +564,13 @@ jobs:
564564
submodules: false
565565

566566
- name: Initialize CodeQL
567-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
567+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
568568
with:
569569
languages: javascript-typescript
570570
config-file: ./.github/codeql/codeql-memory-runtime-boundary-critical-quality.yml
571571

572572
- name: Analyze
573-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
573+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
574574
with:
575575
category: "/codeql-critical-quality/memory-runtime-boundary"
576576

@@ -587,13 +587,13 @@ jobs:
587587
submodules: false
588588

589589
- name: Initialize CodeQL
590-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
590+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
591591
with:
592592
languages: javascript-typescript
593593
config-file: ./.github/codeql/codeql-session-diagnostics-boundary-critical-quality.yml
594594

595595
- name: Analyze
596-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
596+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
597597
with:
598598
category: "/codeql-critical-quality/session-diagnostics-boundary"
599599

@@ -610,13 +610,13 @@ jobs:
610610
submodules: false
611611

612612
- name: Initialize CodeQL
613-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
613+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
614614
with:
615615
languages: javascript-typescript
616616
config-file: ./.github/codeql/codeql-plugin-sdk-reply-runtime-critical-quality.yml
617617

618618
- name: Analyze
619-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
619+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
620620
with:
621621
category: "/codeql-critical-quality/plugin-sdk-reply-runtime"
622622

@@ -633,13 +633,13 @@ jobs:
633633
submodules: false
634634

635635
- name: Initialize CodeQL
636-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
636+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
637637
with:
638638
languages: javascript-typescript
639639
config-file: ./.github/codeql/codeql-provider-runtime-boundary-critical-quality.yml
640640

641641
- name: Analyze
642-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
642+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
643643
with:
644644
category: "/codeql-critical-quality/provider-runtime-boundary"
645645

@@ -655,13 +655,13 @@ jobs:
655655
submodules: false
656656

657657
- name: Initialize CodeQL
658-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
658+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
659659
with:
660660
languages: javascript-typescript
661661
config-file: ./.github/codeql/codeql-ui-control-plane-critical-quality.yml
662662

663663
- name: Analyze
664-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
664+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
665665
with:
666666
category: "/codeql-critical-quality/ui-control-plane"
667667

@@ -677,13 +677,13 @@ jobs:
677677
submodules: false
678678

679679
- name: Initialize CodeQL
680-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
680+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
681681
with:
682682
languages: javascript-typescript
683683
config-file: ./.github/codeql/codeql-web-media-runtime-boundary-critical-quality.yml
684684

685685
- name: Analyze
686-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
686+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
687687
with:
688688
category: "/codeql-critical-quality/web-media-runtime-boundary"
689689

@@ -700,13 +700,13 @@ jobs:
700700
submodules: false
701701

702702
- name: Initialize CodeQL
703-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
703+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
704704
with:
705705
languages: javascript-typescript
706706
config-file: ./.github/codeql/codeql-plugin-boundary-critical-quality.yml
707707

708708
- name: Analyze
709-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
709+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
710710
with:
711711
category: "/codeql-critical-quality/plugin-boundary"
712712

@@ -723,12 +723,12 @@ jobs:
723723
submodules: false
724724

725725
- name: Initialize CodeQL
726-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
726+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
727727
with:
728728
languages: javascript-typescript
729729
config-file: ./.github/codeql/codeql-plugin-sdk-package-contract-critical-quality.yml
730730

731731
- name: Analyze
732-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
732+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
733733
with:
734734
category: "/codeql-critical-quality/plugin-sdk-package-contract"

.github/workflows/codeql-macos-critical-security.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
swift --version
3636
3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
38+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
3939
with:
4040
languages: swift
4141
build-mode: manual
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Analyze
4848
id: analyze
49-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
49+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
5050
with:
5151
output: sarif-results
5252
upload: failure-only
@@ -83,7 +83,7 @@ jobs:
8383
done
8484
8585
- name: Upload filtered SARIF
86-
uses: github/codeql-action/upload-sarif@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
86+
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
8787
with:
8888
sarif_file: sarif-results-filtered
8989
category: "/codeql-critical-security/macos"

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ jobs:
101101
.github/codeql
102102
103103
- name: Initialize CodeQL
104-
uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
104+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
105105
with:
106106
languages: ${{ matrix.language }}
107107
config-file: ${{ matrix.config_file }}
108108

109109
- name: Analyze
110-
uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
110+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
111111
with:
112112
category: "/codeql-security-high/${{ matrix.category }}"

0 commit comments

Comments
 (0)