From 270f04c14cfd3a0c7b651a186a5da99d53b92020 Mon Sep 17 00:00:00 2001 From: amigaire Date: Mon, 6 May 2024 15:05:00 +0200 Subject: [PATCH 1/5] Add commit sha in log when Nelson tries to merge a PR --- src/Akeneo/Git/PullRequestMerger.php | 1 + src/Akeneo/Resources/translations/en.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Akeneo/Git/PullRequestMerger.php b/src/Akeneo/Git/PullRequestMerger.php index 20b18c3..eb8b15f 100644 --- a/src/Akeneo/Git/PullRequestMerger.php +++ b/src/Akeneo/Git/PullRequestMerger.php @@ -24,6 +24,7 @@ public function mergePullRequest(array $pullRequest): void $this->eventDispatcher->dispatch( new GenericEvent($this, [ 'number' => $pullRequest['number'], + 'commit_sha' => $pullRequest['base']['sha'], ]), Events::PRE_GITHUB_MERGE_PR, ); diff --git a/src/Akeneo/Resources/translations/en.yml b/src/Akeneo/Resources/translations/en.yml index a4601ac..82cf2e4 100644 --- a/src/Akeneo/Resources/translations/en.yml +++ b/src/Akeneo/Resources/translations/en.yml @@ -31,5 +31,5 @@ pre_crowdin_packages: 'Checking packages to update' post_crowdin_packages: '%count% package(s) found!' nelson_rename: 'Rename %from% to %to%' nelson_drop_useless: 'Drop useless file %file%' -pre_github_merge_pr: 'Merging Pull Request %number%' +pre_github_merge_pr: 'Merging Pull Request %number% . Commit: %commit_sha%' post_github_merge_pr: 'Pull Request merged!' From 737f66722a9d11df1942bb361d3a1552197774ef Mon Sep 17 00:00:00 2001 From: amigaire Date: Mon, 6 May 2024 15:11:03 +0200 Subject: [PATCH 2/5] Add commit hash in fr translation --- src/Akeneo/Resources/translations/en.fr.yml | 2 +- src/Akeneo/Resources/translations/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Akeneo/Resources/translations/en.fr.yml b/src/Akeneo/Resources/translations/en.fr.yml index f4f76a8..bdbb4e9 100644 --- a/src/Akeneo/Resources/translations/en.fr.yml +++ b/src/Akeneo/Resources/translations/en.fr.yml @@ -29,5 +29,5 @@ pre_github_check_diff: Vérifie les différences avec la branche courante post_github_check_diff: '%diff% différence(s) trouvée(s) !' pre_crowdin_packages: Vérifie les archives à mettre à jour post_crowdin_packages: '%count% archive(s) trouvée(s) !' -pre_github_merge_pr: 'Merge Pull Request %number%' +pre_github_merge_pr: 'Merge Pull Request %number% . Commit: %commit_sha% ' post_github_merge_pr: 'Pull Request mergée!' diff --git a/src/Akeneo/Resources/translations/en.yml b/src/Akeneo/Resources/translations/en.yml index 82cf2e4..b59b5e8 100644 --- a/src/Akeneo/Resources/translations/en.yml +++ b/src/Akeneo/Resources/translations/en.yml @@ -31,5 +31,5 @@ pre_crowdin_packages: 'Checking packages to update' post_crowdin_packages: '%count% package(s) found!' nelson_rename: 'Rename %from% to %to%' nelson_drop_useless: 'Drop useless file %file%' -pre_github_merge_pr: 'Merging Pull Request %number% . Commit: %commit_sha%' +pre_github_merge_pr: 'Merging Pull Request %number% . Commit: %commit_sha% ' post_github_merge_pr: 'Pull Request merged!' From c8dabc8a9b75f18a8b98dcff6ad81021cccf83cc Mon Sep 17 00:00:00 2001 From: amigaire Date: Mon, 6 May 2024 16:15:51 +0200 Subject: [PATCH 3/5] fix tests in error --- src/Akeneo/Nelson/TranslationFilesCleaner.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Akeneo/Nelson/TranslationFilesCleaner.php b/src/Akeneo/Nelson/TranslationFilesCleaner.php index bb5a61d..28a8391 100644 --- a/src/Akeneo/Nelson/TranslationFilesCleaner.php +++ b/src/Akeneo/Nelson/TranslationFilesCleaner.php @@ -184,10 +184,10 @@ public function moveFiles($cleanerDir, $projectDir) ); } else { $this->eventDispatcher->dispatch( - Events::NELSON_DROP_USELESS, new GenericEvent($this, [ 'file' => $file->getPathname(), - ]) + ]), + Events::NELSON_DROP_USELESS, ); } } From fd2512b0772bd36972dff35fe2a9d5251453b6a2 Mon Sep 17 00:00:00 2001 From: amigaire Date: Mon, 6 May 2024 17:39:55 +0200 Subject: [PATCH 4/5] Fix wrong sha passed in merge API call --- src/Akeneo/Git/PullRequestMerger.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Akeneo/Git/PullRequestMerger.php b/src/Akeneo/Git/PullRequestMerger.php index eb8b15f..6a554e6 100644 --- a/src/Akeneo/Git/PullRequestMerger.php +++ b/src/Akeneo/Git/PullRequestMerger.php @@ -24,7 +24,7 @@ public function mergePullRequest(array $pullRequest): void $this->eventDispatcher->dispatch( new GenericEvent($this, [ 'number' => $pullRequest['number'], - 'commit_sha' => $pullRequest['base']['sha'], + 'commit_sha' => $pullRequest['head']['sha'], ]), Events::PRE_GITHUB_MERGE_PR, ); @@ -34,7 +34,7 @@ public function mergePullRequest(array $pullRequest): void $pullRequest['base']['repo']['name'], $pullRequest['number'], $mergeTitle, - $pullRequest['base']['sha'], + $pullRequest['head']['sha'], ); $this->eventDispatcher->dispatch( From 3cf0060242606036940b1922265f145a6595384f Mon Sep 17 00:00:00 2001 From: amigaire Date: Tue, 7 May 2024 11:12:47 +0200 Subject: [PATCH 5/5] fix unit tests --- spec/Akeneo/Git/PullRequestMergerSpec.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spec/Akeneo/Git/PullRequestMergerSpec.php b/spec/Akeneo/Git/PullRequestMergerSpec.php index 386cbdb..61bd392 100644 --- a/spec/Akeneo/Git/PullRequestMergerSpec.php +++ b/spec/Akeneo/Git/PullRequestMergerSpec.php @@ -30,6 +30,9 @@ public function it_merges_a_pull_request(Client $client, PullRequest $githubMerg 'base' => [ 'user' => ['login' => 'nelson'], 'repo' => ['name' => 'akeneo/repo'], + 'sha' => 'master_branch_sha', + ], + 'head' => [ 'sha' => 'pr_sha', ], ]);