From 5d3fa1de90a5217a998552be1324bc8c5222b7c7 Mon Sep 17 00:00:00 2001 From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com> Date: Wed, 3 Jan 2024 14:42:47 -0800 Subject: [PATCH] Hack in an updated GCC13 container. (#182) * Hack GCC13 update with Ubuntu 23.02 * Force installing system pip modules * Use 1001 for UID/GID of coder * Fix lexicographical comparison of Ubuntu version * Fix other version check in rapid's devcontainers feature * Add error checking for empty CUDA deb. * round down to even major ubuntu version * bump feature versions * add test ppa back in * fix oneapi feature tests --------- Co-authored-by: Jake Hemstad Co-authored-by: ptaylor --- features/common/utilities.sh | 2 +- features/src/cccl-dev/common/utilities.sh | 2 +- features/src/cccl-dev/devcontainer-feature.json | 2 +- features/src/cccl-dev/install.sh | 14 ++++++++++---- features/src/cmake/common/utilities.sh | 2 +- features/src/cuda/common/utilities.sh | 2 +- features/src/cuda/devcontainer-feature.json | 2 +- features/src/cuda/install.sh | 12 +++++++++++- features/src/gcc/common/utilities.sh | 2 +- features/src/gcc/devcontainer-feature.json | 2 +- features/src/gcc/install.sh | 1 + features/src/gitlab-cli/common/utilities.sh | 2 +- features/src/llvm/common/utilities.sh | 2 +- features/src/mambaforge/common/utilities.sh | 2 +- features/src/ninja/common/utilities.sh | 2 +- features/src/nvhpc/common/utilities.sh | 2 +- features/src/oneapi/common/utilities.sh | 2 +- .../src/rapids-build-utils/common/utilities.sh | 2 +- features/src/rust/common/utilities.sh | 2 +- features/src/sccache/common/utilities.sh | 2 +- features/src/ucx/common/utilities.sh | 2 +- features/src/utils/common/utilities.sh | 2 +- features/src/utils/devcontainer-feature.json | 2 +- features/src/utils/install.sh | 8 +++++++- features/test/_global/scenarios.json | 4 ++-- .../test/oneapi/{test.sh => oneapi_2023_2_0.sh} | 0 features/test/oneapi/scenarios.json | 10 ++++++++++ features/test/utils/scenarios.json | 12 ++++++------ image/.devcontainer/devcontainer.json | 4 ++-- matrix.yml | 5 +++++ 30 files changed, 74 insertions(+), 36 deletions(-) rename features/test/oneapi/{test.sh => oneapi_2023_2_0.sh} (100%) create mode 100644 features/test/oneapi/scenarios.json diff --git a/features/common/utilities.sh b/features/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/common/utilities.sh +++ b/features/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/cccl-dev/common/utilities.sh b/features/src/cccl-dev/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/cccl-dev/common/utilities.sh +++ b/features/src/cccl-dev/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/cccl-dev/devcontainer-feature.json b/features/src/cccl-dev/devcontainer-feature.json index 8ebf798d..be4f4077 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 3f05fda4..52c4ed16 100644 --- a/features/src/cccl-dev/install.sh +++ b/features/src/cccl-dev/install.sh @@ -31,10 +31,16 @@ fi check_packages ${PKG[@]} ${PKG_TO_REMOVE[@]}; -CC=gcc CXX=g++ python -m pip install --upgrade pip -CC=gcc CXX=g++ python -m pip install wheel setuptools; -CC=gcc CXX=g++ python -m pip install psutil $LIT_VERSION_TO_INSTALL; -CC=gcc CXX=g++ python -m pip install clang-format==17.*; +source /etc/lsb-release; + +if [[ ! "23.04" > "${DISTRIB_RELEASE}" ]]; then + BREAK_PACKAGES="--break-system-packages" +fi + +CC=gcc CXX=g++ python -m pip install $BREAK_PACKAGES --upgrade pip +CC=gcc CXX=g++ python -m pip install $BREAK_PACKAGES wheel setuptools; +CC=gcc CXX=g++ python -m pip install $BREAK_PACKAGES psutil $LIT_VERSION_TO_INSTALL; +CC=gcc CXX=g++ python -m pip install $BREAK_PACKAGES clang-format==17.*; export LIT_VERSION="$(lit --version | grep -o -e '[0-9].*')"; diff --git a/features/src/cmake/common/utilities.sh b/features/src/cmake/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/cmake/common/utilities.sh +++ b/features/src/cmake/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/cuda/common/utilities.sh b/features/src/cuda/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/cuda/common/utilities.sh +++ b/features/src/cuda/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/cuda/devcontainer-feature.json b/features/src/cuda/devcontainer-feature.json index ab4cf263..fd686841 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/cuda/install.sh b/features/src/cuda/install.sh index 2246ddca..812647da 100644 --- a/features/src/cuda/install.sh +++ b/features/src/cuda/install.sh @@ -23,7 +23,13 @@ check_packages \ echo "Downloading CUDA keyring..."; export NVARCH="$(uname -p)"; -export OSNAME="$(. /etc/os-release; echo "$ID${VERSION_ID/./}")"; +export OSNAME="$( + . /etc/os-release; + major="$(cut -d'.' -f1 <<< "${VERSION_ID}")"; + minor="$(cut -d'.' -f2 <<< "${VERSION_ID}")"; + echo "$ID$((major - (major % 2)))${minor}"; +)"; + VERSION="${CUDA_VERSION:-${VERSION:-12.2.0}}"; if [[ "$NVARCH" == aarch64 ]]; then @@ -36,6 +42,10 @@ get_cuda_deb() { | grep -P "^Filename: \./${2}(.*)\.deb$" \ | sort -Vr | head -n1 | cut -d' ' -f2 \ )"; + if [ -z "$deb" ]; then + echo "Error: No matching .deb found for '${1}' and '${2}'" >&2 + return 1 + fi wget --no-hsts -q -O "/tmp/${deb#./}" "${1}/${deb#./}"; echo -n "/tmp/${deb#./}"; } diff --git a/features/src/gcc/common/utilities.sh b/features/src/gcc/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/gcc/common/utilities.sh +++ b/features/src/gcc/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/gcc/devcontainer-feature.json b/features/src/gcc/devcontainer-feature.json index b27ea868..8b609468 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 54b64cf2..1e1d1810 100755 --- a/features/src/gcc/install.sh +++ b/features/src/gcc/install.sh @@ -25,6 +25,7 @@ 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 \ apt-get install -y --no-install-recommends \ diff --git a/features/src/gitlab-cli/common/utilities.sh b/features/src/gitlab-cli/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/gitlab-cli/common/utilities.sh +++ b/features/src/gitlab-cli/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/llvm/common/utilities.sh b/features/src/llvm/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/llvm/common/utilities.sh +++ b/features/src/llvm/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/mambaforge/common/utilities.sh b/features/src/mambaforge/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/mambaforge/common/utilities.sh +++ b/features/src/mambaforge/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/ninja/common/utilities.sh b/features/src/ninja/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/ninja/common/utilities.sh +++ b/features/src/ninja/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/nvhpc/common/utilities.sh b/features/src/nvhpc/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/nvhpc/common/utilities.sh +++ b/features/src/nvhpc/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/oneapi/common/utilities.sh b/features/src/oneapi/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/oneapi/common/utilities.sh +++ b/features/src/oneapi/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/rapids-build-utils/common/utilities.sh b/features/src/rapids-build-utils/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/rapids-build-utils/common/utilities.sh +++ b/features/src/rapids-build-utils/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/rust/common/utilities.sh b/features/src/rust/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/rust/common/utilities.sh +++ b/features/src/rust/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/sccache/common/utilities.sh b/features/src/sccache/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/sccache/common/utilities.sh +++ b/features/src/sccache/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/ucx/common/utilities.sh b/features/src/ucx/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/ucx/common/utilities.sh +++ b/features/src/ucx/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/utils/common/utilities.sh b/features/src/utils/common/utilities.sh index c3ca21a3..fd21d4fe 100644 --- a/features/src/utils/common/utilities.sh +++ b/features/src/utils/common/utilities.sh @@ -212,7 +212,7 @@ find_non_root_user() { USERNAME="${USERNAME:-"${_REMOTE_USER:-"auto"}"}"; if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" - POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") + POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)") for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json index e7555a93..c952d573 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 933ef9f3..81435eb0 100644 --- a/features/src/utils/install.sh +++ b/features/src/utils/install.sh @@ -19,9 +19,15 @@ check_packages \ bash-completion \ ca-certificates ; +source /etc/lsb-release; + +if [[ ! "23.04" > "${DISTRIB_RELEASE}" ]]; then + BREAK_PACKAGES="--break-system-packages" +fi + # upgrade pip if type python >/dev/null 2>&1; then - python -m pip install -U pip; + python -m pip install $BREAK_PACKAGES -U pip; fi # Install yq if not installed diff --git a/features/test/_global/scenarios.json b/features/test/_global/scenarios.json index 29a6b9c4..f2feaec3 100644 --- a/features/test/_global/scenarios.json +++ b/features/test/_global/scenarios.json @@ -16,8 +16,8 @@ "image": "ubuntu:22.04", "features": { "ghcr.io/devcontainers/features/common-utils:2": { - "uid": "1000", - "gid": "1000", + "uid": "1001", + "gid": "1001", "username": "coder", "installZsh": "true", "upgradePackages": "true" diff --git a/features/test/oneapi/test.sh b/features/test/oneapi/oneapi_2023_2_0.sh similarity index 100% rename from features/test/oneapi/test.sh rename to features/test/oneapi/oneapi_2023_2_0.sh diff --git a/features/test/oneapi/scenarios.json b/features/test/oneapi/scenarios.json new file mode 100644 index 00000000..3531c29a --- /dev/null +++ b/features/test/oneapi/scenarios.json @@ -0,0 +1,10 @@ +{ + "oneapi_2023_2_0": { + "image": "ubuntu:22.04", + "features": { + "oneapi": { + "version": "2023.2.0" + } + } + } +} diff --git a/features/test/utils/scenarios.json b/features/test/utils/scenarios.json index f274c465..e823e52c 100644 --- a/features/test/utils/scenarios.json +++ b/features/test/utils/scenarios.json @@ -13,8 +13,8 @@ }, "features": { "ghcr.io/devcontainers/features/common-utils:2": { - "uid": "1000", - "gid": "1000", + "uid": "1001", + "gid": "1001", "username": "coder", "installZsh": "true", "upgradePackages": "true" @@ -59,8 +59,8 @@ }, "features": { "ghcr.io/devcontainers/features/common-utils:2": { - "uid": "1000", - "gid": "1000", + "uid": "1001", + "gid": "1001", "username": "coder", "installZsh": "true", "upgradePackages": "true" @@ -105,8 +105,8 @@ }, "features": { "ghcr.io/devcontainers/features/common-utils:2": { - "uid": "1000", - "gid": "1000", + "uid": "1001", + "gid": "1001", "username": "coder", "installZsh": "true", "upgradePackages": "true" diff --git a/image/.devcontainer/devcontainer.json b/image/.devcontainer/devcontainer.json index d61e6923..30e81407 100644 --- a/image/.devcontainer/devcontainer.json +++ b/image/.devcontainer/devcontainer.json @@ -11,8 +11,8 @@ "workspaceFolder": "/home/coder", "features": { "ghcr.io/devcontainers/features/common-utils:2": { - "userUid": "1000", - "userGid": "1000", + "userUid": "1001", + "userGid": "1001", "username": "coder", "installZsh": "true", "upgradePackages": "true" diff --git a/matrix.yml b/matrix.yml index b8545fe3..700c6f8f 100644 --- a/matrix.yml +++ b/matrix.yml @@ -88,6 +88,11 @@ include: # llvm-cuda-nvhpc (needed by stdexec devcontainers) - {features: [*llvm_curr, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *nvhpc_curr, *python]} +# Hack for getting gcc-13.2 +- os: "ubuntu:23.04" + images: + - {features: [*gcc_13, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *python, *cccl_dev], env: *gcc_env} + - os: "windows" images: # lowest CUDA version