diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml
index 7fce2a20fceb..4a2e972be21c 100644
--- a/.github/workflows/checkstyle.yml
+++ b/.github/workflows/checkstyle.yml
@@ -1,15 +1,11 @@
 name: Code Formatter
 
-on:
-  pull_request:
-  push:
-    branches:
-    - master
+on: [push]
 jobs:
   format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@master
       - uses: actions/setup-python@v2
       - name: Set up JDK 12
         uses: actions/setup-java@v1
@@ -24,5 +20,5 @@ jobs:
           git config --global user.name github-actions
           git config --global user.email '${GITHUB_ACTOR}@users.noreply.github.com'
           git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
-          git commit -am "Formatted with Google Java Formatter"
-          git push --force origin HEAD:$GITHUB_REF
\ No newline at end of file
+          git commit -am "Formatted with Google Java Formatter" || true
+          git push --force origin HEAD:$GITHUB_REF || true