@@ -159,20 +159,22 @@ jobs:
159159 run : cargo install -f rustup-toolchain-install-master
160160 - name : Push changes to a branch and create PR
161161 run : |
162+ # Make it easier to see what happens.
163+ set -x
162164 # Temporarily disable early exit to examine the status code of rustc-josh-sync
163165 set +e
164166 rustc-josh-sync pull
165167 exitcode=$?
166168 set -e
167169
168- # If there were no changes to pull, rustc-josh-sync returns status code 2
169- # In that case skip the rest of the job
170+ # If there were no changes to pull, rustc-josh-sync returns status code 2.
171+ # In that case, skip the rest of the job.
170172 if [ $exitcode -eq 2 ]; then
171173 echo "Nothing changed in rustc, skipping PR"
172174 exit 0
173175 elif [ $exitcode -ne 0 ]; then
174176 # If return code was not 0 or 2, rustc-josh-sync actually failed
175- echo "rustc-josh-sync failed"
177+ echo "error: rustc-josh-sync failed"
176178 exit ${exitcode}
177179 fi
178180
@@ -187,8 +189,6 @@ jobs:
187189 gh pr create -B master --title 'Automatic Rustup' --body 'Please close and re-open this PR to trigger CI, then enable auto-merge.'
188190 env :
189191 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
190- ZULIP_BOT_EMAIL : ${{ secrets.ZULIP_BOT_EMAIL }}
191- ZULIP_API_TOKEN : ${{ secrets.ZULIP_API_TOKEN }}
192192
193193 cron-fail-notify :
194194 name : cronjob failure notification
0 commit comments