Skip to content

Removing compiler build and using rustup #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 30, 2025
Merged

Conversation

dkcumming
Copy link
Collaborator

@dkcumming dkcumming commented Jan 24, 2025

Changing to use rustup for the Rust compiler now that we are not on our own fork.

  • Need build.rs so that correct rust version is used with components installed
  • Need to update README.md
  • Building with Makefile needs to be removed
  • Handling tests with Makefile needs to change to use cargo
  • CI needs to be updated succesfully
  • Need to handle golden tests difference
  • Need to make sure this will still work with mir-semantics (see this PR)

Moved to future work:

  • Change tests to use cargo test ? Could remove Makefile entirely then
  • Need to make sure this will still work with extracting stable-mir-json for cargo projects / std lib

@dkcumming dkcumming self-assigned this Jan 30, 2025
@dkcumming dkcumming changed the title First step to using rustup. Removing compiler build and using rustup Jan 30, 2025
@dkcumming dkcumming marked this pull request as ready for review January 30, 2025 06:05
@jberthold jberthold self-requested a review January 30, 2025 06:22
Copy link
Member

@jberthold jberthold left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, tested locally as well

Makefile Outdated
Comment on lines 41 to 44
build:
cargo build ${RELEASE_FLAG}

clean:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we maybe keep build, and update clean to do the right thing?

Comment on lines -97 to -102
generate_ui_tests:
mkdir -p "${RUST_DIR}"/tests
cd "${RUST_SRC}"; ./get_runpass.sh tests/ui > "${RUST_DIR}"/tests_ui_sources
-cd "${RUST_SRC}"; ./ui_compiletest.sh "${RUST_SRC}" "${RUST_DIR}"/tests/ui/upstream "${RUST_DIR}"/tests_ui_sources --pass check --force-rerun 2>&1 > "${RUST_DIR}"/tests_ui_upstream.log
-cd "${RUST_SRC}"; RUST_BIN="${PWD}"/run.sh ./ui_compiletest.sh "${RUST_SRC}" "${RUST_DIR}"/tests/ui/smir "${RUST_DIR}"/tests_ui_sources --pass check --force-rerun 2>&1 > "${RUST_DIR}"/tests_ui_smir.log

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...reminds me I wanted to still check what exactly this is doing - more test programs and maybe more failure modes that we haven't seen... but we can still replicate this later.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is still accessible on our fork also could add an issue as a reminder there and backlog it

@dkcumming dkcumming force-pushed the remove-building-repo branch from 9c99f1b to 008396b Compare January 30, 2025 06:38
@dkcumming dkcumming merged commit d213c8c into master Jan 30, 2025
1 check passed
@jberthold jberthold deleted the remove-building-repo branch January 30, 2025 22:42
dkcumming added a commit to runtimeverification/mir-semantics that referenced this pull request Jan 31, 2025
Making mir-semantics compatible with PR where [smir-pretty uses
rustup](runtimeverification/stable-mir-json#33)

---------

Co-authored-by: devops <devops@runtimeverification.com>
@dkcumming dkcumming linked an issue Feb 1, 2025 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Integrate rust repository as a git submodule or via rustup
2 participants