File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,8 @@ export const patterns = [
21
21
'!clients/algoliasearch-client-javascript/.yarn/**' ,
22
22
'!clients/algoliasearch-client-javascript/scripts/**' ,
23
23
'!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' ,
25
26
'!clients/algoliasearch-client-javascript/packages/requester-*/**' ,
26
27
'!clients/algoliasearch-client-javascript/packages/client-common/**' ,
27
28
'!clients/algoliasearch-client-javascript/packages/algoliasearch/__tests__/**' ,
Original file line number Diff line number Diff line change @@ -349,7 +349,7 @@ async function prepareGitEnvironment(): Promise<void> {
349
349
console . log ( 'Pulling from origin...' ) ;
350
350
await run ( 'git fetch origin' ) ;
351
351
await run ( 'git fetch --tags --force' ) ;
352
- await run ( 'git pull' ) ;
352
+ await run ( 'git pull origin $(git branch --show-current) ' ) ;
353
353
}
354
354
355
355
async function createReleasePR ( ) : Promise < void > {
@@ -415,7 +415,7 @@ async function createReleasePR(): Promise<void> {
415
415
if ( process . env . LOCAL_TEST_DEV ) {
416
416
await run ( `git commit -m "${ commitMessage } [skip ci]"` ) ;
417
417
} else {
418
- await run ( `CI=false git commit -m "${ commitMessage } "` ) ;
418
+ await run ( `CI=false RELEASE=true git commit -m "${ commitMessage } "` ) ;
419
419
}
420
420
421
421
// cleanup all the changes to the generated files (the ones not commited because of the pre-commit hook)
You can’t perform that action at this time.
0 commit comments