Merge pull request #16891 from jellyfin/renovate/actions-checkout-6.x

Update actions/checkout action to v6
2026-05-22 16:46:54 +01:00 · 2026-05-22 17:23:50 +02:00 · 2026-05-22 15:21:22 +00:00 · 2026-05-22 17:20:14 +02:00 · 2026-05-22 11:41:30 +00:00 · 2026-05-22 13:38:57 +02:00
4 changed files with 8 additions and 7 deletions
--- a/.github/workflows/ci-codeql-analysis.yml
+++ b/.github/workflows/ci-codeql-analysis.yml
@@ -32,13 +32,13 @@ jobs:
        dotnet-version: '10.0.x'

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
+      uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
      with:
        languages: ${{ matrix.language }}
        queries: +security-extended

    - name: Autobuild
-      uses: github/codeql-action/autobuild@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
+      uses: github/codeql-action/autobuild@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
+      uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
--- a/.github/workflows/ci-format.yml
+++ b/.github/workflows/ci-format.yml
@@ -15,9 +15,9 @@ jobs:
  format-check:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

-      - uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
+      - uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
        with:
          dotnet-version: ${{ env.SDK_VERSION }}

--- a/.github/workflows/pull-request-conflict.yml
+++ b/.github/workflows/pull-request-conflict.yml
@@ -4,7 +4,7 @@ on:
  push:
    branches:
      - master
-  pull_request:
+  pull_request_target:
  issue_comment:

 permissions: {}
--- a/Emby.Server.Implementations/Localization/Core/uz.json
+++ b/Emby.Server.Implementations/Localization/Core/uz.json
@@ -82,5 +82,6 @@
    "TaskRefreshChapterImages": "Sahnadan tasvirini chiqarish",
    "TaskRefreshChapterImagesDescription": "Sahnalarni o'z ichiga olgan videolar uchun eskizlarni yaratadi.",
    "TaskRefreshLibrary": "Media kutubxonangizni skanerlash",
-    "TaskCleanLogsDescription": "{0} kundan eski log fayllarni o'chiradi."
+    "TaskCleanLogsDescription": "{0} kundan eski log fayllarni o'chiradi.",
+    "Original": "Original"
 }
Author	SHA1	Message	Date
Bond-009	7e72bc6e9c	Merge pull request #16891 from jellyfin/renovate/actions-checkout-6.x Some checks are pending CodeQL / Analyze (csharp) (push) Waiting to run Details Format / format-check (push) Waiting to run Details Tests / run-tests (macos-latest) (push) Waiting to run Details Tests / run-tests (ubuntu-latest) (push) Waiting to run Details Tests / run-tests (windows-latest) (push) Waiting to run Details OpenAPI Publish / OpenAPI - Publish Artifact (push) Waiting to run Details OpenAPI Publish / OpenAPI - Publish Unstable Spec (push) Blocked by required conditions Details OpenAPI Publish / OpenAPI - Publish Stable Spec (push) Blocked by required conditions Details Project Automation / Project board (push) Waiting to run Details Merge Conflict Labeler / Labeling (push) Waiting to run Details Update actions/checkout action to v6	2026-05-22 17:23:50 +02:00
renovate[bot]	aacb147f4d	Update actions/checkout action to v6	2026-05-22 15:21:22 +00:00
Bond-009	6296a03342	Merge pull request #16890 from jellyfin/renovate/ci-deps Update CI dependencies	2026-05-22 17:20:14 +02:00
renovate[bot]	8ddb485192	Update CI dependencies	2026-05-22 11:41:30 +00:00
Bond-009	400d7d83bc	Merge pull request #16892 from jellyfin/Bond-009-mergeconflict	2026-05-22 13:38:57 +02:00
someone522	4ca3cd79fa	Translated using Weblate (Uzbek) Some checks failed CodeQL / Analyze (csharp) (push) Has been cancelled Details Format / format-check (push) Has been cancelled Details Tests / run-tests (macos-latest) (push) Has been cancelled Details Tests / run-tests (ubuntu-latest) (push) Has been cancelled Details Tests / run-tests (windows-latest) (push) Has been cancelled Details OpenAPI Publish / OpenAPI - Publish Artifact (push) Has been cancelled Details OpenAPI Publish / OpenAPI - Publish Unstable Spec (push) Has been cancelled Details OpenAPI Publish / OpenAPI - Publish Stable Spec (push) Has been cancelled Details Project Automation / Project board (push) Has been cancelled Details Merge Conflict Labeler / Labeling (push) Has been cancelled Details Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/uz/	2026-05-22 06:18:56 +00:00
Bond-009	17e2d3bb11	Fix Merge Conflict Labeler https://github.com/eps1lon/actions-label-merge-conflict#example-usage	2026-05-21 21:40:30 +02:00