Skip to content

fix PS1 in the cccl-dev feature #739

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

Merged
trxcllnt merged 4 commits into from
Jul 16, 2026
Merged

fix PS1 in the cccl-dev feature #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a187042
fix PS1 in the cccl-dev feature
trxcllnt Jul 14, 2026
1a91dba
Merge branch 'main' of github.com:rapidsai/devcontainers into fix/ccc…
trxcllnt Jul 14, 2026
facc1ea
use clangd-23
trxcllnt Jul 15, 2026
e9d0162
remove bash-isms in rcfiles
trxcllnt Jul 15, 2026
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
5 changes: 4 additions & 1 deletion features/src/cccl-dev/.bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ if [ -f "${USERHOME}/.local/share/venvs/cccl/bin/activate" ] \
&& [ -z "${VIRTUAL_ENV:-}" -o "${VIRTUAL_ENV}" != "${USERHOME}/.local/share/venvs/cccl" ]; then
. "${USERHOME}/.local/share/venvs/cccl/bin/activate";
elif [ -n "${VIRTUAL_ENV_PROMPT:-}" ]; then
if ! echo "${PS1:-}" | grep -qF "${VIRTUAL_ENV_PROMPT}"; then
if ! echo "${VIRTUAL_ENV_PROMPT}" | grep -qE "(.*) " \
&& ! echo "${PS1:-}" | grep -qF "(${VIRTUAL_ENV_PROMPT}) "; then
export PS1="(${VIRTUAL_ENV_PROMPT}) ${PS1:-}";
elif ! echo "${PS1:-}" | grep -qF "${VIRTUAL_ENV_PROMPT}"; then
export PS1="${VIRTUAL_ENV_PROMPT}${PS1:-}";
fi
fi
2 changes: 1 addition & 1 deletion features/src/cccl-dev/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "NVIDIA CCCL development utilities",
"id": "cccl-dev",
"version": "26.8.1",
"version": "26.8.2",
"description": "A feature to install NVIDIA CCCL development utilities",
"options": {
"litVersion": {
Expand Down
10 changes: 5 additions & 5 deletions features/src/rapids-build-utils/.bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ export CUDAARCHS="${CUDAARCHS:-all-major}";
export CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}";
export CMAKE_EXPORT_COMPILE_COMMANDS="${CMAKE_EXPORT_COMPILE_COMMANDS:-ON}";

if [[ "${PYTHON_PACKAGE_MANAGER:-}" == "pip" ]]; then
if [ "${PYTHON_PACKAGE_MANAGER:-}" = "pip" ]; then
if [ -n "${DEFAULT_VIRTUAL_ENV:-}" ] \
&& [ -f ~/".local/share/venvs/${DEFAULT_VIRTUAL_ENV}/bin/activate" ] \
&& [ -z "${VIRTUAL_ENV:-}" -o "${VIRTUAL_ENV}" != ~/".local/share/venvs/${DEFAULT_VIRTUAL_ENV}" ]; then
. ~/".local/share/venvs/${DEFAULT_VIRTUAL_ENV}/bin/activate";
elif [ -n "${VIRTUAL_ENV_PROMPT:-}" ]; then
if ! grep -qE "(.*) " <<< "${VIRTUAL_ENV_PROMPT}" \
&& ! grep -qF "(${VIRTUAL_ENV_PROMPT}) " <<< "${PS1:-}"; then
if ! echo "${VIRTUAL_ENV_PROMPT}" | grep -qE "(.*) " \
&& ! echo "${PS1:-}" | grep -qF "(${VIRTUAL_ENV_PROMPT}) "; then
export PS1="(${VIRTUAL_ENV_PROMPT}) ${PS1:-}";
elif ! grep -qF "${VIRTUAL_ENV_PROMPT}" <<< "${PS1:-}"; then
elif ! echo "${PS1:-}" | grep -qF "${VIRTUAL_ENV_PROMPT}"; then
export PS1="${VIRTUAL_ENV_PROMPT}${PS1:-}";
fi
fi
fi

# shellcheck disable=SC2155
export CUDA_VERSION_MAJOR_MINOR="$(grep -Po '^[0-9]+\.[0-9]+' <<< "${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}")";
export CUDA_VERSION_MAJOR_MINOR="$(echo "${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}" | grep -Po '^[0-9]+\.[0-9]+')";
2 changes: 1 addition & 1 deletion features/src/rapids-build-utils/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "NVIDIA RAPIDS devcontainer build utilities",
"id": "rapids-build-utils",
"version": "26.8.8",
"version": "26.8.9",
"description": "A feature to install the RAPIDS devcontainer build utilities",
"containerEnv": {
"BASH_ENV": "/etc/bash.bash_env"
Expand Down
4 changes: 2 additions & 2 deletions matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ x-openmpi: &openmpi { name: "openmpi", version: "5.0.10" }

x-cccl-dev: &cccl_dev { name: "cccl-dev", hide: true, doxygenVersion: "1.9.6" }
x-clangd-dev-bionic: &clangd_dev_bionic { name: "llvm", version: "19", packages: "clangd", hide: true }
x-clangd-dev-jammy: &clangd_dev_jammy { name: "llvm", version: "dev", packages: "clangd", hide: true }
x-clangd-dev: &clangd_dev { name: "llvm", version: "dev", packages: "clangd", hide: true }
x-clangd-dev-jammy: &clangd_dev_jammy { name: "llvm", version: "23", packages: "clangd", hide: true }
x-clangd-dev: &clangd_dev { name: "llvm", version: "23", packages: "clangd", hide: true }
# Clang utils always available:
x-clang-extra-cccl: &clang_extra_cccl { name: "llvm", version: "22", packages: "clang-format clang-tidy llvm-tools", hide: true }
# apt.llvm.org's focal (20.04) arm64 repo is missing clang-format/clang-tidy/llvm-tools for LLVM 22,
Expand Down
Loading