Skip to content

Commit

Permalink
Use nightly version of Rust, close #81
Browse files Browse the repository at this point in the history
  • Loading branch information
Robinlovelace committed Oct 3, 2024
1 parent aa18e32 commit 3b1624e
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion rust/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ RUN R -e "remotes::install_github('acteng/netgen', upgrade = TRUE, dependencies
# robinlovelace/simodels:
RUN R -e "remotes::install_github('robinlovelace/simodels', upgrade = TRUE, dependencies = TRUE)"

RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \
RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y \
&& export PATH="$HOME/.cargo/bin:$PATH" \
&& echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> ~/.profile \
# Also make cargo available and rustc available with ln -s:
&& ln -s /root/.cargo/bin/cargo /usr/local/bin/cargo \
&& ln -s /root/.cargo/bin/rustc /usr/local/bin/rustc \
&& cargo install --locked --git https://github.com/Urban-Analytics-Technology-Platform/od2net \
&& cd /tmp \
&& git clone https://github.com/felt/tippecanoe.git \
Expand Down

6 comments on commit 3b1624e

@JosiahParry
Copy link

Choose a reason for hiding this comment

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

@Robinlovelace i think the real fix here was not the nightly toolchain but linking of rust to the binary paths. I think what you may have been encountering wsa that you installed rust with rustup but it was still using the default version that was located on the path.

@Robinlovelace
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh. Yes. Maybe...

@Robinlovelace
Copy link
Contributor Author

Choose a reason for hiding this comment

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

But I do think rsgeo needs nightly, right?

@JosiahParry
Copy link

@JosiahParry JosiahParry commented on 3b1624e Oct 3, 2024 via email

Choose a reason for hiding this comment

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

@Robinlovelace
Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK my bad..

@JosiahParry
Copy link

@JosiahParry JosiahParry commented on 3b1624e Oct 3, 2024 via email

Choose a reason for hiding this comment

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

Please sign in to comment.