diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-06-15 19:37:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-15 19:37:23 +0200 |
| commit | f2895f314342814ff4ee87b73cf4b3eefcf13868 (patch) | |
| tree | 5bc67aff79b182c57f006bdbe45e132e87f1ff2e /scripts | |
| parent | 45781e107c37524386478b02082700f09bd10d78 (diff) | |
| parent | e9bd63af3cfc192f0f998debbf5ab3e597781cec (diff) | |
Merge pull request #1357 from bjorn3/build_system_rework6
Support testing of cg_clif in rust's CI
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rustup.sh | 6 | ||||
| -rw-r--r-- | scripts/setup_rust_fork.sh | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/scripts/rustup.sh b/scripts/rustup.sh index 3cbeb6375de..e62788f2e50 100755 --- a/scripts/rustup.sh +++ b/scripts/rustup.sh @@ -32,12 +32,10 @@ case $1 in ./clean_all.sh - ./y.rs prepare - - (cd download/sysroot && cargo update && cargo fetch && cp Cargo.lock ../../build_sysroot/) + ./y.sh prepare ;; "commit") - git add rust-toolchain build_sysroot/Cargo.lock + git add rust-toolchain git commit -m "Rustup to $(rustc -V)" ;; "push") diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index abb09775d21..15b16b42be5 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -./y.rs build --no-unstable-features +./y.sh build --no-unstable-features echo "[SETUP] Rust fork" git clone https://github.com/rust-lang/rust.git || true |