Update .github/workflows/rebaseline-tests.yml (#23803)

Author: sbc100

.github/workflows/ci.yml

@@ -64,7 +64,7 @@ jobs:
           # Hack to honor changes to rebaseline_tests.py in the current PR
           git checkout - ./tools/maint/rebaseline_tests.py
           ./bootstrap
-          if ./tools/maint/rebaseline_tests.py --check-only; then
+          if ! ./tools/maint/rebaseline_tests.py --check-only; then
             echo "Test expectations are out-of-date on the target branch."
             echo "You can run './tools/maint/rebaseline_tests.py --new-branch'"
             echo "and use it to create a seperate PR."
@@ -79,7 +79,7 @@ jobs:
           git checkout ${{ github.sha }}
           git rev-parse HEAD
           ./bootstrap
-          if ./tools/maint/rebaseline_tests.py --check-only --clear-cache; then
+          if ! ./tools/maint/rebaseline_tests.py --check-only --clear-cache; then
             echo "Test expectations are out-of-date on the PR branch."
             echo "You can run './tools/maint/rebaseline_tests.py' to"
             echo "create a commit updating the expectations."

.github/workflows/rebaseline-tests.yml

@@ -39,20 +39,18 @@ jobs:
         run: |
           git config user.name emscripten-bot
           git config user.email emscripten-bot@users.noreply.github.com
-          #echo "TEST" >> README.md
-          #git add README.md
-          #git checkout -b testing ${{ github.ref_name }}
-          #git commit -m "Testing"
           ./bootstrap
-          ./tools/maint/rebaseline_tests.py
+          if ./tools/maint/rebaseline_tests.py; then
+             echo "rebaseline_tests returned zero, expectations up-to-date"
+             exit 0
+          fi
+          code=$?
+          if [[ $code != 2 ]] ; then
+             echo "rebaseline_tests.py failed with unexpected error $code"
+             exit 1
+          fi
       - name: Create PR
-        id: cpr
         run: |
           git push origin testing
           gh pr create --fill --base ${{ github.ref_name }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Enable auto-merge
-        run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          gh pr merge --squash --auto

tools/maint/rebaseline_tests.py

@@ -89,7 +89,7 @@ def main():
 
   if not filenames:
     print('test expectations are up-to-date')
-    return 1
+    return 0
 
   if args.check_only:
     message = f'''Test expectations are out-of-date
@@ -120,14 +120,14 @@ def main():
 
   print(message)
   if args.check_only:
-    return 0
+    return 1
 
   if args.new_branch:
     run(['git', 'checkout', '-b', 'rebaseline_tests'])
   run(['git', 'add', '-u', '.'])
   run(['git', 'commit', '-F', '-'], input=message)
 
-  return 0
+  return 2
 
 
 if __name__ == '__main__':