Merge branch 'main' into add_nvforest

Author: trxcllnt

features/src/rapids-build-utils/devcontainer-feature.json

@@ -1,16 +1,16 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "26.4.4",
+  "version": "26.4.5",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
   },
   "postStartCommand": [
     "/bin/bash",
-    "-li",
+    "-lic",
     "+o",
     "history",
-    "rapids-post-start-command"
+    "rapids-post-start-command || true"
   ]
 }

features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh

@@ -1,12 +1,19 @@
 #!/usr/bin/env bash
 
-if ! test -n "${SKIP_RAPIDS_BUILD_UTILS_POST_START_COMMAND:+x}"; then
+_rapids_post_start_command() {
+    local -;
+    set -euo pipefail;
+
     rapids-generate-scripts;
     rapids-update-build-dir-links -j &
     rapids-make-vscode-workspace --update &
     rapids-merge-compile-commands-json > ~/compile_commands.json &
     if test -n "${PYTHON_PACKAGE_MANAGER:+x}"; then
-        rapids-make-"${PYTHON_PACKAGE_MANAGER}"-env "$@" || true;
+        rapids-make-"${PYTHON_PACKAGE_MANAGER}"-env "$@";
     fi
     wait
+}
+
+if ! test -n "${SKIP_RAPIDS_BUILD_UTILS_POST_START_COMMAND:+x}"; then
+    _rapids_post_start_command "$@" <&0;
 fi

features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml

@@ -130,6 +130,8 @@ repos:
 - name: rapidsmpf
   path: rapidsmpf
   git: {<<: *git_defaults, repo: rapidsmpf}
+  dependency_keys:
+    - devcontainers
   cpp:
     - name: rapidsmpf
       sub_dir: cpp