From 993693be3af2421cd8092b1adc940ce9766396e3 Mon Sep 17 00:00:00 2001 From: Anoop Kurungadam Date: Sun, 15 Dec 2024 00:44:08 +0530 Subject: [PATCH 1/5] chore: update mergify config (cherry picked from commit abf6a22ff32bfde53fbad70a539e3ec435e28541) --- .mergify.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 21cdb74802..2450b166a1 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -3,9 +3,8 @@ pull_request_rules: conditions: - and: - author!=Sajinsr - - author!=akashkrishna619 - author!=akurungadam - - author!=frappe-pr-bot + - author!=earthians-pr-bot - author!=mergify[bot] - author!=github-actions[bot] - or: From 9f941ba5f894a216b1718f3f299d058bb396bad2 Mon Sep 17 00:00:00 2001 From: Anoop Kurungadam Date: Sun, 15 Dec 2024 00:43:50 +0530 Subject: [PATCH 2/5] chore: fix symantic release config (cherry picked from commit d1f28b676b3000af333dee14cb0f5c3dbb0905c5) # Conflicts: # .releaserc --- .releaserc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.releaserc b/.releaserc index a4db57f33b..2517c1be42 100644 --- a/.releaserc +++ b/.releaserc @@ -1,5 +1,9 @@ { +<<<<<<< HEAD "branches": ["version-15"], +======= + "branches": ["version-14", "version-15"], +>>>>>>> d1f28b6 (chore: fix symantic release config) "plugins": [ "@semantic-release/commit-analyzer", { "preset": "angular", From 357d1b75cf783560bdf0af606194cd7647c748d1 Mon Sep 17 00:00:00 2001 From: Anoop Kurungadam Date: Sun, 15 Dec 2024 12:37:18 +0530 Subject: [PATCH 3/5] chore: update semantic-release workflow config (cherry picked from commit 7108dfb6b84e36955d93298aec2b7c342e758915) # Conflicts: # .github/workflows/on_release.yml --- .github/workflows/on_release.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml index 86c5f01303..198930ebb2 100644 --- a/.github/workflows/on_release.yml +++ b/.github/workflows/on_release.yml @@ -3,6 +3,10 @@ on: workflow_dispatch: push: branches: +<<<<<<< HEAD +======= + - version-14 +>>>>>>> 7108dfb (chore: update semantic-release workflow config) - version-15 jobs: release: @@ -23,10 +27,10 @@ jobs: npm install @semantic-release/git @semantic-release/exec --no-save - name: Create Release env: - GH_TOKEN: ${{ secrets.RELEASE_TOKEN }} - GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} - GIT_AUTHOR_NAME: "Frappe PR Bot" - GIT_AUTHOR_EMAIL: "developers@frappe.io" - GIT_COMMITTER_NAME: "Frappe PR Bot" - GIT_COMMITTER_EMAIL: "developers@frappe.io" + GH_TOKEN: ${{ secrets.EARTHIANS_BOT_TOKEN }} + GITHUB_TOKEN: ${{ secrets.EARTHIANS_BOT_TOKEN }} + GIT_AUTHOR_NAME: "earthians PR Bot" + GIT_AUTHOR_EMAIL: "devs@earthianslive.com" + GIT_COMMITTER_NAME: "earthians PR Bot" + GIT_COMMITTER_EMAIL: "devs@earthianslive.com" run: npx semantic-release \ No newline at end of file From fc913f755351a3bce25ae34b50bd7f55b3474b9f Mon Sep 17 00:00:00 2001 From: Sajin SR Date: Tue, 24 Dec 2024 14:54:20 +0530 Subject: [PATCH 4/5] fix: conflict fix in on_release.yml --- .github/workflows/on_release.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml index 198930ebb2..5184daf5c8 100644 --- a/.github/workflows/on_release.yml +++ b/.github/workflows/on_release.yml @@ -3,10 +3,7 @@ on: workflow_dispatch: push: branches: -<<<<<<< HEAD -======= - version-14 ->>>>>>> 7108dfb (chore: update semantic-release workflow config) - version-15 jobs: release: @@ -33,4 +30,4 @@ jobs: GIT_AUTHOR_EMAIL: "devs@earthianslive.com" GIT_COMMITTER_NAME: "earthians PR Bot" GIT_COMMITTER_EMAIL: "devs@earthianslive.com" - run: npx semantic-release \ No newline at end of file + run: npx semantic-release From b5ebf156e583eb97a41407ddc0b3c3e8fd0a48a8 Mon Sep 17 00:00:00 2001 From: Sajin SR Date: Tue, 24 Dec 2024 14:55:47 +0530 Subject: [PATCH 5/5] fix: connflict fix on .releaserc --- .releaserc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.releaserc b/.releaserc index 2517c1be42..c3194186ae 100644 --- a/.releaserc +++ b/.releaserc @@ -1,9 +1,5 @@ { -<<<<<<< HEAD - "branches": ["version-15"], -======= - "branches": ["version-14", "version-15"], ->>>>>>> d1f28b6 (chore: fix symantic release config) +"branches": ["version-14", "version-15"], "plugins": [ "@semantic-release/commit-analyzer", { "preset": "angular", @@ -25,4 +21,4 @@ ], "@semantic-release/github" ] -} \ No newline at end of file +}