renovate 40.26.2 → 40.27.0

package/dist/modules/platform/default-scm.d.ts

@@ -12,4 +12,5 @@ export declare class DefaultGitScm implements PlatformScm {
     checkoutBranch(branchName: string): Promise<LongCommitSha>;
     mergeAndPush(branchName: string): Promise<void>;
     mergeToLocal(branchName: string): Promise<void>;
+    syncForkWithUpstream(branchName: string): Promise<void>;
 }

package/dist/modules/platform/default-scm.js

@@ -37,6 +37,12 @@ class DefaultGitScm {
     mergeToLocal(branchName) {
         return git.mergeToLocal(branchName);
     }
+    async syncForkWithUpstream(branchName) {
+        const remotes = await git.getRemotes();
+        if (remotes?.includes('upstream')) {
+            await git.syncForkWithUpstream(branchName);
+        }
+    }
 }
 exports.DefaultGitScm = DefaultGitScm;
 //# sourceMappingURL=default-scm.js.map

package/dist/modules/platform/default-scm.js.map

@@ -1 +1 @@
-{"version":3,"file":"default-scm.js","sourceRoot":"","sources":["../../../lib/modules/platform/default-scm.ts"],"names":[],"mappings":";;;;AAAA,4DAAsC;AAItC,MAAa,aAAa;IACxB,YAAY,CAAC,UAAkB;QAC7B,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,aAAa,CACX,YAA+B;QAE/B,OAAO,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,YAAY,CAAC,UAAkB;QAC7B,OAAO,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACtC,CAAC;IAED,eAAe,CAAC,UAAkB;QAChC,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,kBAAkB,CAAC,UAAkB,EAAE,UAAkB;QACvD,OAAO,GAAG,CAAC,kBAAkB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACxD,CAAC;IAED,kBAAkB,CAAC,UAAkB,EAAE,MAAc;QACnD,OAAO,GAAG,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,gBAAgB,CAAC,UAAkB,EAAE,UAAkB;QACrD,OAAO,GAAG,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACtD,CAAC;IAED,WAAW;QACT,OAAO,GAAG,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC;IAED,cAAc,CAAC,UAAkB;QAC/B,OAAO,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAED,YAAY,CAAC,UAAkB;QAC7B,OAAO,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IAED,YAAY,CAAC,UAAkB;QAC7B,OAAO,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACtC,CAAC;CACF;AA9CD,sCA8CC","sourcesContent":["import * as git from '../../util/git';\nimport type { CommitFilesConfig, LongCommitSha } from '../../util/git/types';\nimport type { PlatformScm } from './types';\n\nexport class DefaultGitScm implements PlatformScm {\n  branchExists(branchName: string): Promise<boolean> {\n    return Promise.resolve(git.branchExists(branchName));\n  }\n\n  commitAndPush(\n    commitConfig: CommitFilesConfig,\n  ): Promise<LongCommitSha | null> {\n    return git.commitFiles(commitConfig);\n  }\n\n  deleteBranch(branchName: string): Promise<void> {\n    return git.deleteBranch(branchName);\n  }\n\n  getBranchCommit(branchName: string): Promise<LongCommitSha | null> {\n    return Promise.resolve(git.getBranchCommit(branchName));\n  }\n\n  isBranchBehindBase(branchName: string, baseBranch: string): Promise<boolean> {\n    return git.isBranchBehindBase(branchName, baseBranch);\n  }\n\n  isBranchConflicted(baseBranch: string, branch: string): Promise<boolean> {\n    return git.isBranchConflicted(baseBranch, branch);\n  }\n\n  isBranchModified(branchName: string, baseBranch: string): Promise<boolean> {\n    return git.isBranchModified(branchName, baseBranch);\n  }\n\n  getFileList(): Promise<string[]> {\n    return git.getFileList();\n  }\n\n  checkoutBranch(branchName: string): Promise<LongCommitSha> {\n    return git.checkoutBranch(branchName);\n  }\n\n  mergeAndPush(branchName: string): Promise<void> {\n    return git.mergeBranch(branchName);\n  }\n\n  mergeToLocal(branchName: string): Promise<void> {\n    return git.mergeToLocal(branchName);\n  }\n}\n"]}
+{"version":3,"file":"default-scm.js","sourceRoot":"","sources":["../../../lib/modules/platform/default-scm.ts"],"names":[],"mappings":";;;;AAAA,4DAAsC;AAItC,MAAa,aAAa;IACxB,YAAY,CAAC,UAAkB;QAC7B,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,aAAa,CACX,YAA+B;QAE/B,OAAO,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,YAAY,CAAC,UAAkB;QAC7B,OAAO,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACtC,CAAC;IAED,eAAe,CAAC,UAAkB;QAChC,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,kBAAkB,CAAC,UAAkB,EAAE,UAAkB;QACvD,OAAO,GAAG,CAAC,kBAAkB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACxD,CAAC;IAED,kBAAkB,CAAC,UAAkB,EAAE,MAAc;QACnD,OAAO,GAAG,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,gBAAgB,CAAC,UAAkB,EAAE,UAAkB;QACrD,OAAO,GAAG,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACtD,CAAC;IAED,WAAW;QACT,OAAO,GAAG,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC;IAED,cAAc,CAAC,UAAkB;QAC/B,OAAO,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAED,YAAY,CAAC,UAAkB;QAC7B,OAAO,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IAED,YAAY,CAAC,UAAkB;QAC7B,OAAO,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,UAAkB;QAC3C,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;QACvC,IAAI,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YAClC,MAAM,GAAG,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;CACF;AArDD,sCAqDC","sourcesContent":["import * as git from '../../util/git';\nimport type { CommitFilesConfig, LongCommitSha } from '../../util/git/types';\nimport type { PlatformScm } from './types';\n\nexport class DefaultGitScm implements PlatformScm {\n  branchExists(branchName: string): Promise<boolean> {\n    return Promise.resolve(git.branchExists(branchName));\n  }\n\n  commitAndPush(\n    commitConfig: CommitFilesConfig,\n  ): Promise<LongCommitSha | null> {\n    return git.commitFiles(commitConfig);\n  }\n\n  deleteBranch(branchName: string): Promise<void> {\n    return git.deleteBranch(branchName);\n  }\n\n  getBranchCommit(branchName: string): Promise<LongCommitSha | null> {\n    return Promise.resolve(git.getBranchCommit(branchName));\n  }\n\n  isBranchBehindBase(branchName: string, baseBranch: string): Promise<boolean> {\n    return git.isBranchBehindBase(branchName, baseBranch);\n  }\n\n  isBranchConflicted(baseBranch: string, branch: string): Promise<boolean> {\n    return git.isBranchConflicted(baseBranch, branch);\n  }\n\n  isBranchModified(branchName: string, baseBranch: string): Promise<boolean> {\n    return git.isBranchModified(branchName, baseBranch);\n  }\n\n  getFileList(): Promise<string[]> {\n    return git.getFileList();\n  }\n\n  checkoutBranch(branchName: string): Promise<LongCommitSha> {\n    return git.checkoutBranch(branchName);\n  }\n\n  mergeAndPush(branchName: string): Promise<void> {\n    return git.mergeBranch(branchName);\n  }\n\n  mergeToLocal(branchName: string): Promise<void> {\n    return git.mergeToLocal(branchName);\n  }\n\n  async syncForkWithUpstream(branchName: string): Promise<void> {\n    const remotes = await git.getRemotes();\n    if (remotes?.includes('upstream')) {\n      await git.syncForkWithUpstream(branchName);\n    }\n  }\n}\n"]}

package/dist/modules/platform/github/index.js

@@ -525,27 +525,6 @@ async function initRepo({ endpoint, repository, forkCreation, forkOrg, forkToken
                     logger_1.logger.warn({ err }, 'Could not set default branch');
                 } /* v8 ignore stop */
             }
-            // This is a lovely "hack" by GitHub that lets us force update our fork's default branch
-            // with the base commit from the parent repository
-            const url = `repos/${config.repository}/git/refs/heads/${config.defaultBranch}`;
-            const sha = repo.defaultBranchRef.target.oid;
-            try {
-                logger_1.logger.debug(`Updating forked repository default sha ${sha} to match upstream`);
-                await common_2.githubApi.patchJson(url, {
-                    body: {
-                        sha,
-                        force: true,
-                    },
-                    token: (0, string_1.coerceString)(forkToken, opts.token),
-                });
-            }
-            catch (err) /* v8 ignore start */ {
-                logger_1.logger.warn({ url, sha, err: err.err ?? err }, 'Error updating fork from upstream - cannot continue');
-                if (err instanceof external_host_error_1.ExternalHostError) {
-                    throw err;
-                }
-                throw new external_host_error_1.ExternalHostError(err);
-            } /* v8 ignore stop */
         }
         else if (forkCreation) {
             logger_1.logger.debug('Forked repo is not found - attempting to create it');
@@ -573,9 +552,15 @@ async function initRepo({ endpoint, repository, forkCreation, forkOrg, forkToken
     parsedEndpoint.host = parsedEndpoint.host.replace('api.github.com', 'github.com');
     parsedEndpoint.pathname = `${config.repository}.git`;
     const url = node_url_1.default.format(parsedEndpoint);
+    let upstreamUrl = undefined;
+    if (forkCreation && config.parentRepo) {
+        parsedEndpoint.pathname = config.parentRepo + '.git';
+        upstreamUrl = node_url_1.default.format(parsedEndpoint);
+    }
     await git.initRepo({
         ...config,
         url,
+        upstreamUrl,
     });
     const repoConfig = {
         defaultBranch: config.defaultBranch,