self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-17 18:44:45 +02:00
Code Issues Releases Activity

Chore: Default plugins: Refactor git checkout in default plugins build (#9812)

Browse Source
This commit is contained in:
Henry Heino 2024-02-02 14:55:28 -08:00 committed by GitHub
parent 0e45336140
commit 9a26e8aafd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@ -570,6 +570,7 @@ packages/default-plugins/build.js
packages/default-plugins/buildDefaultPlugins.js packages/default-plugins/buildDefaultPlugins.js
packages/default-plugins/commands/buildAll.js packages/default-plugins/commands/buildAll.js
packages/default-plugins/commands/editPatch.js packages/default-plugins/commands/editPatch.js
packages/default-plugins/utils/getCurrentCommitHash.js
packages/default-plugins/utils/getPathToPatchFileFor.js packages/default-plugins/utils/getPathToPatchFileFor.js
packages/default-plugins/utils/readRepositoryJson.js packages/default-plugins/utils/readRepositoryJson.js
packages/default-plugins/utils/waitForCliInput.js packages/default-plugins/utils/waitForCliInput.js

1
.gitignore vendored
View File

@ -550,6 +550,7 @@ packages/default-plugins/build.js
packages/default-plugins/buildDefaultPlugins.js packages/default-plugins/buildDefaultPlugins.js
packages/default-plugins/commands/buildAll.js packages/default-plugins/commands/buildAll.js
packages/default-plugins/commands/editPatch.js packages/default-plugins/commands/editPatch.js
packages/default-plugins/utils/getCurrentCommitHash.js
packages/default-plugins/utils/getPathToPatchFileFor.js packages/default-plugins/utils/getPathToPatchFileFor.js
packages/default-plugins/utils/readRepositoryJson.js packages/default-plugins/utils/readRepositoryJson.js
packages/default-plugins/utils/waitForCliInput.js packages/default-plugins/utils/waitForCliInput.js

24
packages/default-plugins/buildDefaultPlugins.ts
View File

@ -10,6 +10,7 @@ import { glob } from 'glob';
import readRepositoryJson from './utils/readRepositoryJson'; import readRepositoryJson from './utils/readRepositoryJson';
import waitForCliInput from './utils/waitForCliInput'; import waitForCliInput from './utils/waitForCliInput';
import getPathToPatchFileFor from './utils/getPathToPatchFileFor'; import getPathToPatchFileFor from './utils/getPathToPatchFileFor';
import getCurrentCommitHash from './utils/getCurrentCommitHash';
type BeforeEachInstallCallback = (buildDir: string, pluginName: string)=> Promise<void>; type BeforeEachInstallCallback = (buildDir: string, pluginName: string)=> Promise<void>;
@ -41,20 +42,21 @@ const buildDefaultPlugins = async (outputParentDir: string|null, beforeInstall:
} }
chdir(pluginDir); chdir(pluginDir);
const currentCommitHash = (await execCommand(['git', 'rev-parse', 'HEAD'])).trim();
const expectedCommitHash = repositoryData.commit; const expectedCommitHash = repositoryData.commit;
if (currentCommitHash !== expectedCommitHash) { logStatus(`Switching to commit ${expectedCommitHash}`);
logStatus(`Switching to commit ${expectedCommitHash}`); await execCommand(['git', 'switch', repositoryData.branch]);
await execCommand(['git', 'switch', repositoryData.branch]);
try { try {
await execCommand(['git', 'checkout', expectedCommitHash]); await execCommand(['git', 'checkout', expectedCommitHash]);
} catch (error) { } catch (error) {
logStatus(`git checkout failed with error ${error}. Fetching...`); logStatus(`git checkout failed with error ${error}. Fetching...`);
await execCommand(['git', 'fetch']); await execCommand(['git', 'fetch']);
await execCommand(['git', 'checkout', expectedCommitHash]); await execCommand(['git', 'checkout', expectedCommitHash]);
} }
if (await getCurrentCommitHash() !== expectedCommitHash) {
throw new Error(`Unable to checkout commit ${expectedCommitHash}`);
} }
logStatus('Copying repository files...'); logStatus('Copying repository files...');

7
packages/default-plugins/utils/getCurrentCommitHash.ts Normal file
View File

@ -0,0 +1,7 @@
import { execCommand } from '@joplin/utils';
const getCurrentCommitHash = async () => {
return (await execCommand(['git', 'rev-parse', '--verify', 'HEAD^{commit}'])).trim();
};
export default getCurrentCommitHash;