Merge branch 'main' into feat/11398-blobless-git

renovatebot · Sep 1, 2021 · 925f85d · 925f85d
2 parents ba5ed76 + e8f68c4
commit 925f85d
Show file tree

Hide file tree

Showing 75 changed files with 1,633 additions and 2,066 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM containerbase/node:14.17.5@sha256:3fce5dfc917107aca3cf3823a42ffae92a4bb433a55aa1f5be5f7caeb0019b20
+FROM containerbase/node:14.17.6@sha256:ebe928dcb70c9ec5ad36adc576218d81a3f2a598f0b8cfa14c23467957596389
 
 
 # renovate: datasource=npm

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -22,6 +22,7 @@
       "args": [
         "--runInBand",
         "--collectCoverage=false",
+        "--testTimeout 100000000",
         "--runTestsByPath",
         "${relativeFile}"
       ],
@@ -42,7 +43,11 @@
       "request": "launch",
       "name": "Jest All",
       "program": "${workspaceFolder}/node_modules/.bin/jest",
-      "args": ["--runInBand", "--collectCoverage=false"],
+      "args": [
+        "--runInBand",
+        "--collectCoverage=false",
+        "--testTimeout 100000000"
+      ],
       "env": {
         "NODE_ENV": "test",
         "LOG_LEVEL": "debug"
@@ -64,7 +69,12 @@
       "disableOptimisticBPs": true,
       "cwd": "${workspaceFolder}",
       "runtimeExecutable": "yarn",
-      "args": ["jest", "--runInBand", "--watchAll=false"]
+      "args": [
+        "jest",
+        "--runInBand",
+        "--watchAll=false",
+        "--testTimeout 100000000"
+      ]
     }
   ]
 }
diff --git a/docs/usage/automerge-configuration.md → docs/usage/key-concepts/automerge.md b/docs/usage/automerge-configuration.md → docs/usage/key-concepts/automerge.md
diff --git a/lib/config/__snapshots__/massage.spec.ts.snap b/lib/config/__snapshots__/massage.spec.ts.snap
@@ -1,5 +1,26 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`config/massage massageConfig does not massage lockFileMaintenance 1`] = `
+Object {
+  "packageRules": Array [
+    Object {
+      "lockFileMaintenance": Object {
+        "enabled": true,
+      },
+      "matchBaseBranches": Array [
+        "release/ft10/1.9.x",
+      ],
+      "matchManagers": Array [
+        "helmv3",
+      ],
+      "schedule": Array [
+        "at any time",
+      ],
+    },
+  ],
+}
+`;
+
 exports[`config/massage massageConfig massages packageRules matchUpdateTypes 1`] = `
 Object {
   "packageRules": Array [

diff --git a/lib/config/massage.spec.ts b/lib/config/massage.spec.ts
@@ -42,5 +42,20 @@ describe('config/massage', () => {
       expect(res).toMatchSnapshot();
       expect(res.packageRules).toHaveLength(3);
     });
+    it('does not massage lockFileMaintenance', () => {
+      const config: RenovateConfig = {
+        packageRules: [
+          {
+            matchManagers: ['helmv3'],
+            matchBaseBranches: ['release/ft10/1.9.x'],
+            lockFileMaintenance: { enabled: true },
+            schedule: ['at any time'],
+          },
+        ],
+      };
+      const res = massage.massageConfig(config);
+      expect(res).toMatchSnapshot();
+      expect(res.packageRules).toHaveLength(1);
+    });
   });
 });
diff --git a/lib/config/massage.ts b/lib/config/massage.ts
@@ -47,7 +47,6 @@ export function massageConfig(config: RenovateConfig): RenovateConfig {
       'patch',
       'pin',
       'digest',
-      'lockFileMaintenance',
       'rollback',
     ];
     for (const rule of massagedConfig.packageRules) {

diff --git a/lib/datasource/api.ts b/lib/datasource/api.ts
@@ -11,6 +11,7 @@ import * as gitRefs from './git-refs';
 import * as gitTags from './git-tags';
 import * as githubReleases from './github-releases';
 import * as githubTags from './github-tags';
+import { GitlabReleasesDatasource } from './gitlab-releases';
 import * as gitlabTags from './gitlab-tags';
 import * as go from './go';
 import { GradleVersionDatasource } from './gradle-version';
@@ -50,6 +51,7 @@ api.set('git-tags', gitTags);
 api.set('github-releases', githubReleases);
 api.set('github-tags', githubTags);
 api.set('gitlab-tags', gitlabTags);
+api.set(GitlabReleasesDatasource.id, new GitlabReleasesDatasource());
 api.set('go', go);
 api.set('gradle-version', new GradleVersionDatasource());
 api.set('helm', new HelmDatasource());