@@ -147,16 +147,16 @@ jobs:
147
147
- uses : actions/checkout@v4
148
148
with :
149
149
fetch-depth : 256 # get a bit more of the history
150
- - name : install josh-proxy
151
- run : cargo +stable install josh-proxy --git https://github.com/josh-project /josh --tag r24.10.04
150
+ - name : install josh-sync
151
+ run : cargo +stable install --locked --git https://github.com/rust-lang /josh-sync
152
152
- name : setup bot git name and email
153
153
run : |
154
154
git config --global user.name 'The Miri Cronjob Bot'
155
155
git config --global user.email 'miri@cron.bot'
156
156
- name : Install nightly toolchain
157
157
run : rustup toolchain install nightly --profile minimal
158
158
- name : get changes from rustc
159
- run : ./miri rustc-pull
159
+ run : rustc-josh-sync pull --allow-noop
160
160
- name : Install rustup-toolchain-install-master
161
161
run : cargo install -f rustup-toolchain-install-master
162
162
- name : format changes (if any)
@@ -166,7 +166,7 @@ jobs:
166
166
- name : Push changes to a branch and create PR
167
167
run : |
168
168
# `git diff --exit-code` "succeeds" if the diff is empty.
169
- if git diff --exit-code HEAD^ ; then echo "Nothing changed in rustc, skipping PR"; exit 0; fi
169
+ if git diff --exit-code ${GITHUB_SHA} ; then echo "Nothing changed in rustc, skipping PR"; exit 0; fi
170
170
# The diff is non-empty, create a PR.
171
171
BRANCH="rustup-$(date -u +%Y-%m-%d)"
172
172
git switch -c $BRANCH
0 commit comments