fix(javascript): release process (#2106)

algolia · Oct 11, 2023 · 2c58dea · 2c58dea
1 parent 275620f
commit 2c58dea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/config/generation.config.mjs b/config/generation.config.mjs
@@ -21,7 +21,8 @@ export const patterns = [
   '!clients/algoliasearch-client-javascript/.yarn/**',
   '!clients/algoliasearch-client-javascript/scripts/**',
   '!clients/algoliasearch-client-javascript/tests/**',
-  'clients/algoliasearch-client-javascript/packages/**/package.json',
+  // the release process is allowed to push changes to this file, but in general we don't because those files are generated
+  process.env.RELEASE ? '!clients/algoliasearch-client-javascript/packages/**/package.json' : 'clients/algoliasearch-client-javascript/packages/**/package.json',
   '!clients/algoliasearch-client-javascript/packages/requester-*/**',
   '!clients/algoliasearch-client-javascript/packages/client-common/**',
   '!clients/algoliasearch-client-javascript/packages/algoliasearch/__tests__/**',

diff --git a/scripts/release/createReleasePR.ts b/scripts/release/createReleasePR.ts
@@ -349,7 +349,7 @@ async function prepareGitEnvironment(): Promise<void> {
   console.log('Pulling from origin...');
   await run('git fetch origin');
   await run('git fetch --tags --force');
-  await run('git pull');
+  await run('git pull origin $(git branch --show-current)');
 }
 
 async function createReleasePR(): Promise<void> {
@@ -415,7 +415,7 @@ async function createReleasePR(): Promise<void> {
   if (process.env.LOCAL_TEST_DEV) {
     await run(`git commit -m "${commitMessage} [skip ci]"`);
   } else {
-    await run(`CI=false git commit -m "${commitMessage}"`);
+    await run(`CI=false RELEASE=true git commit -m "${commitMessage}"`);
   }
 
   // cleanup all the changes to the generated files (the ones not commited because of the pre-commit hook)