From 5384ea123723af2698439dc3f8dd2e337c58d302 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 3 Jan 2024 11:57:05 -0800
Subject: [PATCH] bump feature versions

---
 features/src/cccl-dev/devcontainer-feature.json | 2 +-
 features/src/cccl-dev/install.sh                | 2 +-
 features/src/cuda/devcontainer-feature.json     | 2 +-
 features/src/gcc/devcontainer-feature.json      | 2 +-
 features/src/gcc/install.sh                     | 1 -
 features/src/utils/devcontainer-feature.json    | 2 +-
 features/src/utils/install.sh                   | 2 ++
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/features/src/cccl-dev/devcontainer-feature.json b/features/src/cccl-dev/devcontainer-feature.json
index 8ebf798d3..be4f40778 100644
--- a/features/src/cccl-dev/devcontainer-feature.json
+++ b/features/src/cccl-dev/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA CCCL development utilities",
   "id": "cccl-dev",
-  "version": "24.2.0",
+  "version": "24.2.1",
   "description": "A feature to install NVIDIA CCCL development utilities",
   "options": {
     "litVersion": {
diff --git a/features/src/cccl-dev/install.sh b/features/src/cccl-dev/install.sh
index 9298d1eb9..52c4ed168 100644
--- a/features/src/cccl-dev/install.sh
+++ b/features/src/cccl-dev/install.sh
@@ -31,7 +31,7 @@ fi
 
 check_packages ${PKG[@]} ${PKG_TO_REMOVE[@]};
 
-source /etc/lsb-release
+source /etc/lsb-release;
 
 if [[ ! "23.04" > "${DISTRIB_RELEASE}" ]]; then
   BREAK_PACKAGES="--break-system-packages"
diff --git a/features/src/cuda/devcontainer-feature.json b/features/src/cuda/devcontainer-feature.json
index ab4cf2634..fd6868410 100644
--- a/features/src/cuda/devcontainer-feature.json
+++ b/features/src/cuda/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "CUDA Toolkit",
   "id": "cuda",
-  "version": "24.2.1",
+  "version": "24.2.2",
   "description": "A feature to install the NVIDIA CUDA Toolkit",
   "options": {
     "version": {
diff --git a/features/src/gcc/devcontainer-feature.json b/features/src/gcc/devcontainer-feature.json
index b27ea8687..8b609468d 100644
--- a/features/src/gcc/devcontainer-feature.json
+++ b/features/src/gcc/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "GCC",
   "id": "gcc",
-  "version": "24.2.0",
+  "version": "24.2.1",
   "description": "A feature to install gcc",
   "options": {
     "version": {
diff --git a/features/src/gcc/install.sh b/features/src/gcc/install.sh
index 1e1d18106..ba16a7fb4 100755
--- a/features/src/gcc/install.sh
+++ b/features/src/gcc/install.sh
@@ -24,7 +24,6 @@ GCC_VERSION_DEFAULT="$(gcc -dumpversion)";
 GCC_VERSION="${VERSION:-${GCC_VERSION_DEFAULT}}";
 
 if [[ "${GCC_VERSION}" != "${GCC_VERSION_DEFAULT}" ]]; then
-    apt-add-repository -y ppa:ubuntu-toolchain-r/test;
     apt-add-repository -y ppa:ubuntu-toolchain-r/ppa;
     # Install gcc-${GCC_VERSION}
     DEBIAN_FRONTEND=noninteractive              \
diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
index e7555a936..c952d573e 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": "24.2.1",
+  "version": "24.2.2",
   "description": "A feature to install RAPIDS devcontainer utility scripts",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index ab33f8775..81435eb01 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -19,6 +19,8 @@ check_packages      \
     bash-completion \
     ca-certificates ;
 
+source /etc/lsb-release;
+
 if [[ ! "23.04" > "${DISTRIB_RELEASE}" ]]; then
   BREAK_PACKAGES="--break-system-packages"
 fi