mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #2666 - RalfJung:josh, r=RalfJung

Browse Source 
update josh instructions

https://github.com/josh-project/josh/pull/965 and https://github.com/josh-project/josh/pull/994 have been merged so we don't need a forked josh any more. :)

However, this is blocked on https://github.com/josh-project/josh/issues/1032 which currently prevents me from actually testing this...
This commit is contained in:
bors 2022-11-15 16:24:10 +00:00
commit a046f62bb4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/miri/CONTRIBUTING.md
View File

@ -283,13 +283,13 @@ With this, you should now have a working development setup! See
## Advanced topic: Syncing with the rustc repo ## Advanced topic: Syncing with the rustc repo
We use the [`josh` proxy](https://github.com/josh-project/josh) to transmit We use the [`josh` proxy](https://github.com/josh-project/josh) to transmit
changes between the rustc and Miri repositories. For now, a fork of josh needs to be built changes between the rustc and Miri repositories. For now, the latest git version
from source. This downloads and runs josh: of josh needs to be built from source. This downloads and runs josh:
```sh ```sh
git clone https://github.com/RalfJung/josh git clone https://github.com/josh-project/josh
cd josh cd josh
cargo run --release -p josh-proxy -- --local=$(pwd)/local --remote=https://github.com --no-background cargo run --release -p josh-proxy -- --local=local --remote=https://github.com --no-background
``` ```
### Importing changes from the rustc repo ### Importing changes from the rustc repo

4
src/tools/miri/miri
View File

@ -78,7 +78,7 @@ shift
# macOS does not have a useful readlink/realpath so we have to use Python instead... # macOS does not have a useful readlink/realpath so we have to use Python instead...
MIRIDIR=$(python3 -c 'import os, sys; print(os.path.dirname(os.path.realpath(sys.argv[1])))' "$0") MIRIDIR=$(python3 -c 'import os, sys; print(os.path.dirname(os.path.realpath(sys.argv[1])))' "$0")
# Used for rustc syncs. # Used for rustc syncs.
JOSH_FILTER=":at_commit=75dd959a3a40eb5b4574f8d2e23aa6efbeb33573[:prefix=src/tools/miri]:/src/tools/miri" JOSH_FILTER=":rev(75dd959a3a40eb5b4574f8d2e23aa6efbeb33573:prefix=src/tools/miri):/src/tools/miri"
# Needed for `./miri bench`. # Needed for `./miri bench`.
TOOLCHAIN=$(cd "$MIRIDIR"; rustup show active-toolchain | head -n 1 | cut -d ' ' -f 1) TOOLCHAIN=$(cd "$MIRIDIR"; rustup show active-toolchain | head -n 1 | cut -d ' ' -f 1)
@ -149,7 +149,7 @@ rustc-push)
# and set `-o base` to a branch that holds current rustc master. # and set `-o base` to a branch that holds current rustc master.
echo "Preparing $USER/rust..." echo "Preparing $USER/rust..."
if git fetch https://github.com/$USER/rust $BRANCH &>/dev/null; then if git fetch https://github.com/$USER/rust $BRANCH &>/dev/null; then
echo "The '$BRANCH' seems to already exist in $USER/rust. Please delete it and try again." echo "The branch '$BRANCH' seems to already exist in $USER/rust. Please delete it and try again."
exit 1 exit 1
fi fi
git fetch https://github.com/rust-lang/rust master git fetch https://github.com/rust-lang/rust master