Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/rust/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "rust",
"version": "1.0.2",
"version": "1.0.3",
"name": "Rust",
"description": "Installs Rust, common Rust utilities, and their required dependencies",
"options": {
Expand Down
4 changes: 2 additions & 2 deletions src/rust/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ else
apt-get -y install --no-install-recommends git
fi

echo ${RUST_VERSION} | grep -q "nightly"
is_nightly=$?
is_nightly=0
echo ${RUST_VERSION} | grep -q "nightly" || is_nightly=$?
if [ $is_nightly = 0 ]; then
check_nightly_version_formatting RUST_VERSION
else
Expand Down
15 changes: 15 additions & 0 deletions test-scenarios/rust_at_pinned_version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

set -e

# Optional: Import test library
source dev-container-features-test-lib

# Definition specific tests
check "cargo version" cargo --version
check "rustc version" rustc --version
check "correct rust version" rustc --version | grep 1.62.0


# Report result
reportResults
20 changes: 14 additions & 6 deletions test-scenarios/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
"version": "latest",
"installGradle": true,
"installMaven": true
}
}
}
}
},
"install_additional_php": {
"image": "ubuntu:focal",
"features": {
"php": {
"version": "8.1.4",
"additionalVersions": "8.0.17,8.0.3"
}
}
},
}
}
},
"install_additional_java": {
"image": "ubuntu:focal",
"features": {
Expand Down Expand Up @@ -92,6 +92,14 @@
}
}
},
"rust_at_pinned_version": {
"image": "ubuntu:focal",
"features": {
"rust": {
"version": "1.62.0"
}
}
},
"install_cudnn_nvxt": {
"image": "debian",
"features": {
Expand All @@ -112,4 +120,4 @@
}
}
}
}
}