Skip to content
Snippets Groups Projects
Commit 3d84c22c authored by Rhys Arkins's avatar Rhys Arkins Committed by GitHub
Browse files

feat: skip regenerating lock file maintenance if branch exists (#956)

parent c96f24a8
No related branches found
No related tags found
No related merge requests found
...@@ -197,6 +197,12 @@ async function getUpdatedLockFiles(config) { ...@@ -197,6 +197,12 @@ async function getUpdatedLockFiles(config) {
let lockFileError = false; let lockFileError = false;
const updatedLockFiles = []; const updatedLockFiles = [];
try { try {
if (
config.type === 'lockFileMaintenance' &&
(await config.api.branchExists(config.branchName))
) {
return { lockFileError, updatedLockFiles };
}
const dirs = module.exports.determineLockFileDirs(config); const dirs = module.exports.determineLockFileDirs(config);
logger.debug({ dirs }, 'lock file dirs'); logger.debug({ dirs }, 'lock file dirs');
await module.exports.writeExistingFiles(config); await module.exports.writeExistingFiles(config);
......
...@@ -47,6 +47,13 @@ Object { ...@@ -47,6 +47,13 @@ Object {
} }
`; `;
exports[`workers/branch/lock-files getUpdatedLockFiles returns no error and empty lockfiles if lock file maintenance exists 1`] = `
Object {
"lockFileError": false,
"updatedLockFiles": Array [],
}
`;
exports[`workers/branch/lock-files getUpdatedLockFiles returns no error and empty lockfiles if none updated 1`] = ` exports[`workers/branch/lock-files getUpdatedLockFiles returns no error and empty lockfiles if none updated 1`] = `
Object { Object {
"lockFileError": false, "lockFileError": false,
......
...@@ -276,7 +276,10 @@ describe('workers/branch/lock-files', () => { ...@@ -276,7 +276,10 @@ describe('workers/branch/lock-files', () => {
beforeEach(() => { beforeEach(() => {
config = { config = {
...defaultConfig, ...defaultConfig,
api: { getFileContent: jest.fn(() => 'some lock file contents') }, api: {
branchExists: jest.fn(),
getFileContent: jest.fn(() => 'some lock file contents'),
},
logger, logger,
tmpDir: { name: 'some-tmp-dir' }, tmpDir: { name: 'some-tmp-dir' },
}; };
...@@ -286,6 +289,14 @@ describe('workers/branch/lock-files', () => { ...@@ -286,6 +289,14 @@ describe('workers/branch/lock-files', () => {
yarn.generateLockFile.mockReturnValue('some lock file contents'); yarn.generateLockFile.mockReturnValue('some lock file contents');
lockFiles.determineLockFileDirs = jest.fn(); lockFiles.determineLockFileDirs = jest.fn();
}); });
it('returns no error and empty lockfiles if lock file maintenance exists', async () => {
config.type = 'lockFileMaintenance';
config.api.branchExists.mockReturnValueOnce(true);
const res = await getUpdatedLockFiles(config);
expect(res).toMatchSnapshot();
expect(res.lockFileError).toBe(false);
expect(res.updatedLockFiles).toHaveLength(0);
});
it('returns no error and empty lockfiles if none updated', async () => { it('returns no error and empty lockfiles if none updated', async () => {
lockFiles.determineLockFileDirs.mockReturnValueOnce({ lockFiles.determineLockFileDirs.mockReturnValueOnce({
packageLockFileDirs: [], packageLockFileDirs: [],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment