Merge branch 'main' into feat/replacement-part-lookup+versioning

renovatebot · Nov 14, 2022 · 644f6af · 644f6af
2 parents 6156dd4 + d23e9d0
commit 644f6af
Show file tree

Hide file tree

Showing 170 changed files with 1,839 additions and 665 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM containerbase/node:18.12.0@sha256:dab36a9935ce28f0e2cdf25083a3d810fff98877832f13a239a1e30714829b12
+FROM containerbase/node:18.12.1@sha256:fe459c9670594c2beb3dfbbd23c51905e6f85c865735f88265790d47bc569a9e
 
 USER root
 

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -30,7 +30,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f # tag=v2.1.30
+        uses: github/codeql-action/init@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # tag=v2.1.31
         with:
           languages: javascript
 
@@ -40,7 +40,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f # tag=v2.1.30
+        uses: github/codeql-action/autobuild@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # tag=v2.1.31
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -54,4 +54,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@18fe527fa8b29f134bb91f32f1a5dc5abb15ed7f # tag=v2.1.30
+        uses: github/codeql-action/analyze@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # tag=v2.1.31
diff --git a/data/azure-pipelines-tasks.json b/data/azure-pipelines-tasks.json
@@ -142,6 +142,7 @@
     "3.150.0"
   ],
   "appcentertest": [
+    "1.214.0",
     "1.208.1",
     "1.208.0",
     "1.207.0",
@@ -162,6 +163,8 @@
     "1.131.0"
   ],
   "archivefiles": [
+    "2.213.0",
+    "2.211.1",
     "2.211.0",
     "2.206.0",
     "2.201.2",
@@ -247,6 +250,7 @@
     "0.2.32"
   ],
   "azureappservicesettings": [
+    "1.214.0",
     "1.208.0",
     "1.198.0",
     "1.194.0",
@@ -276,6 +280,7 @@
     "1.0.0"
   ],
   "azurecli": [
+    "1.213.0",
     "1.208.0",
     "1.198.0",
     "1.164.0",
@@ -309,6 +314,7 @@
     "1.137.1",
     "1.137.0",
     "1.132.0",
+    "2.213.0",
     "2.208.0",
     "2.198.0",
     "2.1.2",
@@ -368,6 +374,7 @@
     "1.3.5",
     "1.3.4"
   ],
+  "azurecontainerapps": ["0.213.0"],
   "azurefilecopy": [
     "1.202.0",
     "1.198.0",
@@ -686,6 +693,7 @@
     "1.0.2",
     "1.0.1",
     "1.0.0",
+    "2.213.0",
     "2.211.2",
     "2.211.1",
     "2.210.0",
@@ -737,6 +745,7 @@
     "1.0.3"
   ],
   "azureiotedge": [
+    "2.213.0",
     "2.211.0",
     "2.202.0",
     "2.199.0",
@@ -772,6 +781,7 @@
     "2.0.0"
   ],
   "azurekeyvault": [
+    "1.213.0",
     "1.212.0",
     "1.211.2",
     "1.211.1",
@@ -1323,6 +1333,7 @@
     "3.0.0"
   ],
   "azurermwebappdeployment": [
+    "3.213.0",
     "3.208.0",
     "3.198.0",
     "3.195.1",
@@ -1373,6 +1384,7 @@
     "3.4.2",
     "3.4.1",
     "3.4.0",
+    "4.213.0",
     "4.212.0",
     "4.208.1",
     "4.208.0",
@@ -1846,6 +1858,7 @@
     "1.140.0"
   ],
   "containerbuild": [
+    "0.213.0",
     "0.210.0",
     "0.208.0",
     "0.198.0",
@@ -2104,6 +2117,7 @@
     "0.4.16"
   ],
   "dockerinstaller": [
+    "0.213.0",
     "0.209.0",
     "0.198.0",
     "0.181.0",
@@ -2544,6 +2558,7 @@
     "0.148.0"
   ],
   "downloadpackage": [
+    "0.213.0",
     "0.210.0",
     "0.208.1",
     "0.208.0",
@@ -2601,6 +2616,8 @@
     "0.1.10",
     "0.1.9",
     "0.1.8",
+    "1.213.0",
+    "1.211.0",
     "1.210.0",
     "1.208.1",
     "1.208.0",
@@ -2751,6 +2768,8 @@
     "0.0.1"
   ],
   "extractfiles": [
+    "1.213.0",
+    "1.211.1",
     "1.211.0",
     "1.200.0",
     "1.198.0",
@@ -3165,6 +3184,7 @@
     "0.1.8"
   ],
   "helminstaller": [
+    "0.213.0",
     "0.210.0",
     "0.198.0",
     "0.181.0",
@@ -3326,6 +3346,7 @@
     "0.5.5"
   ],
   "installapplecertificate": [
+    "2.214.0",
     "2.212.0",
     "2.200.0",
     "2.198.1",
@@ -3706,6 +3727,7 @@
   ],
   "kubernetesmanifestbased": ["1.0.4", "0.0.1", "0.0.11"],
   "kubernetes": [
+    "0.213.0",
     "0.212.0",
     "0.211.1",
     "0.211.0",
@@ -3768,6 +3790,7 @@
     "0.1.23",
     "0.1.22",
     "0.1.21",
+    "1.213.1",
     "1.213.0",
     "1.211.1",
     "1.211.0",
@@ -3916,6 +3939,7 @@
     "0.0.1"
   ],
   "mavenauthenticate": [
+    "0.213.0",
     "0.210.0",
     "0.198.0",
     "0.194.0",
@@ -4172,6 +4196,7 @@
     "1.0.0"
   ],
   "nodetool": [
+    "0.213.0",
     "0.211.0",
     "0.210.1",
     "0.210.0",
@@ -4273,6 +4298,7 @@
     "0.2.25",
     "0.2.24",
     "0.2.23",
+    "1.213.0",
     "1.208.1",
     "1.208.0",
     "1.202.0",
@@ -4361,6 +4387,7 @@
     "0.156.2",
     "0.156.1",
     "0.156.0",
+    "1.213.0",
     "1.203.0"
   ],
   "nugetcommand": [
@@ -4810,6 +4837,7 @@
     "0.1.2",
     "0.1.1",
     "0.1.0",
+    "1.213.0",
     "1.206.0",
     "1.198.0",
     "1.177.1",
@@ -5114,6 +5142,7 @@
     "0.135.0"
   ],
   "pythonscript": [
+    "0.213.0",
     "0.200.0",
     "0.198.0",
     "0.182.0",
@@ -5396,6 +5425,7 @@
     "1.0.0"
   ],
   "ssh": [
+    "0.213.0",
     "0.207.1",
     "0.207.0",
     "0.200.0",
@@ -5480,6 +5510,7 @@
     "0.1.2",
     "0.1.1",
     "0.1.0",
+    "1.213.0",
     "1.211.0",
     "1.208.0",
     "1.198.0",
@@ -5620,6 +5651,7 @@
     "1.0.0"
   ],
   "usenode": [
+    "1.213.0",
     "1.210.0",
     "1.208.1",
     "1.208.0",
@@ -5664,6 +5696,9 @@
     "1.0.0"
   ],
   "usepythonversion": [
+    "0.214.0",
+    "0.213.1",
+    "0.213.0",
     "0.206.0",
     "0.205.0",
     "0.200.0",
@@ -5696,6 +5731,7 @@
     "0.134.2"
   ],
   "userubyversion": [
+    "0.213.0",
     "0.200.0",
     "0.198.0",
     "0.193.0",
@@ -5948,6 +5984,7 @@
     "2.1.0"
   ],
   "xamarinandroid": [
+    "1.213.0",
     "1.212.0",
     "1.208.0",
     "1.200.0",
@@ -5987,6 +6024,7 @@
     "1.135.0"
   ],
   "xamarinios": [
+    "2.213.0",
     "2.200.1",
     "2.200.0",
     "2.198.0",
@@ -6027,6 +6065,7 @@
     "1.135.0"
   ],
   "xcode": [
+    "5.213.0",
     "5.200.0",
     "5.198.1",
     "5.198.0",

diff --git a/data/debian-distro-info.json b/data/debian-distro-info.json
@@ -129,5 +129,10 @@
     "codename": "Trixie",
     "series": "trixie",
     "created": "2023-08-01"
+  },
+  "v14": {
+    "codename": "Forky",
+    "series": "forky",
+    "created": "2025-08-01"
   }
 }
diff --git a/data/node-js-schedule.json b/data/node-js-schedule.json
@@ -100,7 +100,7 @@
     "lts": "2022-10-25",
     "maintenance": "2023-10-18",
     "end": "2025-04-30",
-    "codename": ""
+    "codename": "Hydrogen"
   },
   "v19": {
     "start": "2022-10-18",

diff --git a/data/ubuntu-distro-info.json b/data/ubuntu-distro-info.json
@@ -274,10 +274,10 @@
     "eol": "2023-07-20"
   },
   "v23.04": {
-    "codename": "L L",
-    "series": "l-series",
+    "codename": "Lunar Lobster",
+    "series": "lunar",
     "created": "2022-10-20",
-    "release": "2023-04-27",
+    "release": "2023-04-20",
     "eol": "2024-01-25"
   }
 }
diff --git a/docs/development/assets/renovate-flow.md b/docs/development/assets/renovate-flow.md
@@ -1,7 +1,7 @@
 ```mermaid
 flowchart TB
     subgraph Start
-    A[lib/renovate.ts] --> B[getConfig ordered by cli->env->file->default]
+    A[lib/renovate.ts] --> B[getConfig ordered by priority useBaseBranchConfig > Cli > ENV > file > default]
     A --> C[global initialize]
     A --> D[init platform]
     A --> E[set and ensure dir]

diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md
@@ -1414,6 +1414,7 @@ Supported lock files are:
 
 - `package-lock.json`
 - `yarn.lock`
+- `pnpm-lock.yaml`
 - `composer.lock`
 - `Gemfile.lock`
 - `poetry.lock`

diff --git a/docs/usage/docker.md b/docs/usage/docker.md
@@ -369,7 +369,7 @@ To get access to the token a custom Renovate Docker image is needed that include
 The Dockerfile to create such an image can look like this:
 
 ```Dockerfile
-FROM renovate/renovate:34.9.1
+FROM renovate/renovate:34.24.0
 # Include the "Docker tip" which you can find here https://cloud.google.com/sdk/docs/install
 # under "Installation" for "Debian/Ubuntu"
 RUN ...

diff --git a/docs/usage/self-hosted-configuration.md b/docs/usage/self-hosted-configuration.md
@@ -669,6 +669,11 @@ Set this to an S3 URI to enable S3 backed repository cache.
     AWS_REGION
 ```
 
+<!-- prettier-ignore -->
+!!! tip
+    If you're storing the repository cache on Amazon S3 then you may set a folder hierarchy as part of `repositoryCacheType`.
+    For example, `repositoryCacheType: 's3://bucket-name/dir1/.../dirN/'`.
+
 ## requireConfig
 
 By default, Renovate needs a Renovate config file in each repository where it runs before it will propose any dependency updates.

diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts
@@ -1127,7 +1127,6 @@ const options: RenovateOptions[] = [
     type: 'string',
     stage: 'package',
     parent: 'packageRules',
-    mergeable: true,
     cli: false,
     env: false,
   },
@@ -1138,7 +1137,6 @@ const options: RenovateOptions[] = [
     type: 'string',
     stage: 'package',
     parent: 'packageRules',
-    mergeable: true,
     cli: false,
     env: false,
   },