Skip to content

Commit 2c58dea

Browse files
authored
fix(javascript): release process (#2106)
1 parent 275620f commit 2c58dea

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

config/generation.config.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ export const patterns = [
2121
'!clients/algoliasearch-client-javascript/.yarn/**',
2222
'!clients/algoliasearch-client-javascript/scripts/**',
2323
'!clients/algoliasearch-client-javascript/tests/**',
24-
'clients/algoliasearch-client-javascript/packages/**/package.json',
24+
// the release process is allowed to push changes to this file, but in general we don't because those files are generated
25+
process.env.RELEASE ? '!clients/algoliasearch-client-javascript/packages/**/package.json' : 'clients/algoliasearch-client-javascript/packages/**/package.json',
2526
'!clients/algoliasearch-client-javascript/packages/requester-*/**',
2627
'!clients/algoliasearch-client-javascript/packages/client-common/**',
2728
'!clients/algoliasearch-client-javascript/packages/algoliasearch/__tests__/**',

scripts/release/createReleasePR.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ async function prepareGitEnvironment(): Promise<void> {
349349
console.log('Pulling from origin...');
350350
await run('git fetch origin');
351351
await run('git fetch --tags --force');
352-
await run('git pull');
352+
await run('git pull origin $(git branch --show-current)');
353353
}
354354

355355
async function createReleasePR(): Promise<void> {
@@ -415,7 +415,7 @@ async function createReleasePR(): Promise<void> {
415415
if (process.env.LOCAL_TEST_DEV) {
416416
await run(`git commit -m "${commitMessage} [skip ci]"`);
417417
} else {
418-
await run(`CI=false git commit -m "${commitMessage}"`);
418+
await run(`CI=false RELEASE=true git commit -m "${commitMessage}"`);
419419
}
420420

421421
// cleanup all the changes to the generated files (the ones not commited because of the pre-commit hook)

0 commit comments

Comments
 (0)