From d0cbdcb972c596f5e7337581e1b1716828eeb6fe Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Mon, 27 Jan 2025 13:23:05 +0530 Subject: [PATCH] NTP-1234 | GHA | Update Commiter (#14675) --- .github/workflows/branch-cut.yml | 6 +++--- .github/workflows/spotless.yml | 11 ++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/branch-cut.yml b/.github/workflows/branch-cut.yml index 9cf6570406..b41f3ce979 100644 --- a/.github/workflows/branch-cut.yml +++ b/.github/workflows/branch-cut.yml @@ -40,10 +40,10 @@ jobs: uses: actions/checkout@v4 with: token: ${{ steps.get-token.outputs.token }} - - name: Setup Git Credentials for android-bot@navi.com + - name: Setup Git Credentials for navi-android[bot] run: | - git config --global user.email "android-bot@navi.com" - git config --global user.name "Android Bot" + git config --global user.name "navi-android[bot]" + git config --global user.email "194247829+navi-android[bot]@users.noreply.github.com" - name: Checkout release-${{ inputs.version_name }} from ${{ github.ref_name }} run: git checkout -b release-${{ inputs.version_name }} - name: Update Version Name (${{ inputs.version_name }}) & Version Code (${{ inputs.version_code }}) diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml index e85bc0be75..a9df560093 100644 --- a/.github/workflows/spotless.yml +++ b/.github/workflows/spotless.yml @@ -57,14 +57,11 @@ jobs: run: chmod +x gradlew - name: Run Spotless Action - ${{ inputs.action }} run: ./gradlew spotless${{ inputs.action }} - - name: Setup Git Credentials for android-bot@navi.com + - name: Setup Git Credentials for navi-android[bot] if: inputs.action == 'apply' run: | - git config --global user.email "android-bot@navi.com" - git config --global user.name "Android Bot" + git config --global user.name "navi-android[bot]" + git config --global user.email "194247829+navi-android[bot]@users.noreply.github.com" - name: Commit & Push Spotless Changes if: inputs.action == 'apply' - run: | - git add . - git commit -m "NTP-7559 | Apply Spotless Changes" - git push + run: git commit -am "NTP-7559 | Apply Spotless Changes" && git push