Skip to content
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.

Sign up for GitHub

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

Upgrade tokio and other dependencies #57

Merged
merged 1 commit into from
Sep 3, 2021
Merged

Upgrade tokio and other dependencies #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.51
FROM rust:1.52

# versions (according to their git tag) of different tools to download
# https://github.com/EmbarkStudios/cargo-deny/releases
Expand Down Expand Up @@ -47,4 +47,11 @@ RUN mkdir .node \
-not -wholename '.node/lib*' -delete

ENV PATH=$PATH:/home/$USER/.node/bin
ENV EDITOR=code
# ENV GIT_EDITOR="code --wait"
# ENV GIT_EXTERNAL_DIFF='code --wait --diff $LOCAL $REMOTE'

RUN git config --global core.editor "code --wait" \
&& git config --global diff.tool vscode \
&& git config --global difftool.vscode.cmd 'code --wait --diff $LOCAL $REMOTE' \
&& git config --global merge.tool vscode \
&& git config --global mergetool.vscode.cmd 'code --wait $MERGED'
Loading