diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3da9ec879..300e29ef9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -78,33 +78,29 @@ jobs:
           pip-${{ runner.os }}-
           pip-
     - name: Run CI script
-      shell: bash -e -o pipefail -l {0}
+      shell: bash -x -e -o pipefail -l {0}
       env:
         BAZEL_CACHE_CREDENTIAL_B64: ${{ secrets.BAZEL_CACHE_CREDENTIAL_B64 }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        #LINUX_WHEELS: 1
-        #MAC_WHEELS: 1
         RAY_DEFAULT_BUILD: 1
         WINDOWS_WHEELS: 1
-      run: |
-        python -u ci/remote-watch.py --skip_repo=ray-project/ray &
-        . ./ci/travis/ci.sh init
-        . ./ci/travis/ci.sh build
-        . ./ci/travis/ci.sh upload_wheels || true
-        . ./ci/travis/ci.sh test_python
-        . ./ci/travis/ci.sh test_core
-        . ./ci/travis/ci.sh test_wheels
-    - name: Upload test result
-      if: github.repository == 'ray-project/ray' && github.event_name != 'pull_request'
-      shell: bash -e -o pipefail -l {0}
-      env:
-        # TODO: upload this secret to github
         BAZEL_LOG_BUCKET_ACCESS_KEY: ${{ secrets.BAZEL_LOG_BUCKET_ACCESS_KEY }}
         TRAVIS_BRANCH: ${{ github.ref	}}
         TRAVIS_COMMIT: ${{ github.sha }}
         TRAVIS_JOB_ID: ${{ github.run_id }}
       run: |
-        ./ci/travis/upload_build_info.sh
+        function clean_up() {
+          echo "Performing cleanup"
+          if [ "${GITHUB_EVENT_NAME}" != "pull_request" ]; then ./ci/travis/upload_build_info.sh; fi
+        }
+        trap clean_up EXIT
+
+        python -u ci/remote-watch.py --skip_repo=ray-project/ray &
+        . ./ci/travis/ci.sh init
+        . ./ci/travis/ci.sh build
+        . ./ci/travis/ci.sh upload_wheels || true
+        . ./ci/travis/ci.sh test_core
+        . ./ci/travis/ci.sh test_python
     - name: Run Clang Include-What-You-Use
       continue-on-error: true
       if: runner.os == 'Linux'
diff --git a/ci/remote-watch.py b/ci/remote-watch.py
index f25e200bc..731046f87 100755
--- a/ci/remote-watch.py
+++ b/ci/remote-watch.py
@@ -253,6 +253,7 @@ def main(program, *args):
         result = monitor()
     else:
         logger.info("Skipping monitoring %s %s build", repo_slug, event_name)
+        result = 0
     return result