diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml index cbe503d342..9d82bed5cf 100644 --- a/.github/workflows/on_release.yml +++ b/.github/workflows/on_release.yml @@ -4,6 +4,7 @@ on: push: branches: - version-14 + - version-15 jobs: release: name: Release @@ -23,10 +24,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 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: diff --git a/.releaserc b/.releaserc index a5489bdd2e..23c27e1ccd 100644 --- a/.releaserc +++ b/.releaserc @@ -1,5 +1,5 @@ { - "branches": ["version-14"], + "branches": ["version-14", "version-15"], "plugins": [ "@semantic-release/commit-analyzer", { "preset": "angular",