Skip to content

Commit 58e4250

Browse files
authored
fix rust error when choose a non-default version. (#111)
port of microsoft/vscode-dev-containers#1592
1 parent ec1deb8 commit 58e4250

4 files changed

Lines changed: 32 additions & 9 deletions

File tree

src/rust/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "rust",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"name": "Rust",
55
"description": "Installs Rust, common Rust utilities, and their required dependencies",
66
"options": {

src/rust/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ else
179179
apt-get -y install --no-install-recommends git
180180
fi
181181

182-
echo ${RUST_VERSION} | grep -q "nightly"
183-
is_nightly=$?
182+
is_nightly=0
183+
echo ${RUST_VERSION} | grep -q "nightly" || is_nightly=$?
184184
if [ $is_nightly = 0 ]; then
185185
check_nightly_version_formatting RUST_VERSION
186186
else
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
# Optional: Import test library
6+
source dev-container-features-test-lib
7+
8+
# Definition specific tests
9+
check "cargo version" cargo --version
10+
check "rustc version" rustc --version
11+
check "correct rust version" rustc --version | grep 1.62.0
12+
13+
14+
# Report result
15+
reportResults

test-scenarios/scenarios.json

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
"version": "latest",
77
"installGradle": true,
88
"installMaven": true
9-
}
10-
}
9+
}
10+
}
1111
},
1212
"install_additional_php": {
1313
"image": "ubuntu:focal",
1414
"features": {
1515
"php": {
1616
"version": "8.1.4",
1717
"additionalVersions": "8.0.17,8.0.3"
18-
}
19-
}
20-
},
18+
}
19+
}
20+
},
2121
"install_additional_java": {
2222
"image": "ubuntu:focal",
2323
"features": {
@@ -92,6 +92,14 @@
9292
}
9393
}
9494
},
95+
"rust_at_pinned_version": {
96+
"image": "ubuntu:focal",
97+
"features": {
98+
"rust": {
99+
"version": "1.62.0"
100+
}
101+
}
102+
},
95103
"install_cudnn_nvxt": {
96104
"image": "debian",
97105
"features": {
@@ -112,4 +120,4 @@
112120
}
113121
}
114122
}
115-
}
123+
}

0 commit comments

Comments
 (0)