Skip to content

Commit c7d58a5

Browse files
committed
Update CI workflow
1 parent 59ea58f commit c7d58a5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,16 @@ jobs:
147147
- uses: actions/checkout@v4
148148
with:
149149
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
152152
- name: setup bot git name and email
153153
run: |
154154
git config --global user.name 'The Miri Cronjob Bot'
155155
git config --global user.email 'miri@cron.bot'
156156
- name: Install nightly toolchain
157157
run: rustup toolchain install nightly --profile minimal
158158
- name: get changes from rustc
159-
run: ./miri rustc-pull
159+
run: rustc-josh-sync pull --allow-noop
160160
- name: Install rustup-toolchain-install-master
161161
run: cargo install -f rustup-toolchain-install-master
162162
- name: format changes (if any)
@@ -166,7 +166,7 @@ jobs:
166166
- name: Push changes to a branch and create PR
167167
run: |
168168
# `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
170170
# The diff is non-empty, create a PR.
171171
BRANCH="rustup-$(date -u +%Y-%m-%d)"
172172
git switch -c $BRANCH

0 commit comments

Comments
 (0)