From 9d80948fc6416e9b58a856b47007b315be119d98 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 9 Jun 2026 19:06:56 -0700
Subject: [PATCH 1/4] enable sccache debug logs in devcontainer

---
 .devcontainer/rapids.Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.devcontainer/rapids.Dockerfile b/.devcontainer/rapids.Dockerfile
index 18d35d5c..47b50e13 100644
--- a/.devcontainer/rapids.Dockerfile
+++ b/.devcontainer/rapids.Dockerfile
@@ -65,6 +65,7 @@ ENV SCCACHE_REGION="us-east-2"
 ENV SCCACHE_BUCKET="rapids-sccache-devs"
 ENV SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE=true
 ENV SCCACHE_IDLE_TIMEOUT=0
+ENV SCCACHE_SERVER_LOG=sccache=debug
 
 ###
 # sccache-dist configuration

From 3570f687ce0ff9d2633c625d4c82d917c134a798 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 9 Jun 2026 19:07:18 -0700
Subject: [PATCH 2/4] don't redirect stderr so server startup errors are
 visible

---
 features/src/utils/opt/devcontainer/bin/sccache/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/utils/opt/devcontainer/bin/sccache/start.sh b/features/src/utils/opt/devcontainer/bin/sccache/start.sh
index e98ff280..390df7b2 100755
--- a/features/src/utils/opt/devcontainer/bin/sccache/start.sh
+++ b/features/src/utils/opt/devcontainer/bin/sccache/start.sh
@@ -62,7 +62,7 @@ _start_sccache() {
         SCCACHE_ERROR_LOG="${logfile}"          \
         SCCACHE_SERVER_LOG="${log_lvl}"         \
         SCCACHE_SERVER_PORT="${sccache_port}"   \
-        sccache --start-server 1>&2 2>/dev/null \
+        sccache --start-server 1>&2             \
       | tee "$logfile";
 
         # If the pidfile doesn't exist, write it

From f99161aee31de516c4175ae79def5e9f3abe4225 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 9 Jun 2026 19:07:54 -0700
Subject: [PATCH 3/4] remove old timestamp file before regenerating credentials

---
 .../src/utils/opt/devcontainer/bin/creds/s3/gh/generate.sh    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/features/src/utils/opt/devcontainer/bin/creds/s3/gh/generate.sh b/features/src/utils/opt/devcontainer/bin/creds/s3/gh/generate.sh
index 3009bb79..332e0dbd 100755
--- a/features/src/utils/opt/devcontainer/bin/creds/s3/gh/generate.sh
+++ b/features/src/utils/opt/devcontainer/bin/creds/s3/gh/generate.sh
@@ -46,6 +46,10 @@ _creds_github_generate() {
 
     mkdir -p ~/.aws;
 
+    if test -w ~/.aws; then
+        rm -f ~/.aws/stamp;
+    fi
+
     for org in "${user_orgs[@]}"; do
         generated_at="$(date '+%s')";
         if gh nv-gha-aws org "${org}" "${nv_gha_aws_args[@]}" >"${HOME}/.aws/credentials" 2>>/var/log/devcontainer-utils/creds-s3.log; then

From 2aa3dd268e874dda4082f4671b43af87c9f4d6f9 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 9 Jun 2026 19:08:04 -0700
Subject: [PATCH 4/4] bump feature version

---
 features/src/utils/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
index 28b4a8b2..9589dd4d 100644
--- a/features/src/utils/devcontainer-feature.json
+++ b/features/src/utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "devcontainer-utils",
   "id": "utils",
-  "version": "26.8.1",
+  "version": "26.8.2",
   "description": "A feature to install RAPIDS devcontainer utility scripts",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"