Skip to content

Commit 964ba22

Browse files
authored
Merge branch 'release/26.04' into python-3.14
2 parents 4b6ddf0 + 6897a64 commit 964ba22

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

features/src/mambaforge/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Mambaforge",
33
"id": "mambaforge",
4-
"version": "26.4.0",
4+
"version": "26.4.1",
55
"description": "A feature to install mambaforge",
66
"options": {
77
"version": {

features/src/mambaforge/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /usr/bin/env bash
22
set -e
33

4-
MINIFORGE_VERSION="${VERSION:-${MINIFORGE_VERSION:-latest}}";
4+
MINIFORGE_VERSION="${MINIFORGE_VERSION:-${VERSION:-latest}}";
55

66
# Ensure we're in this feature's directory during build
77
cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";

matrix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ x-ucx-rapids: &ucx_rapids { name: "ucx", version: "1.19.0" }
4040
x-openmpi: &openmpi { name: "openmpi", version: "5.0.7" }
4141

4242
x-cccl-dev: &cccl_dev { name: "cccl-dev", hide: true, doxygenVersion: "1.9.6" }
43-
x-clangd-dev-bionic: &clangd_dev_bionic { name: "llvm", version: "22", packages: "clangd", repoVersionOverride: "latest", hide: true }
44-
x-clangd-dev-jammy: &clangd_dev_jammy { name: "llvm", version: "22", packages: "clangd", repoVersionOverride: "latest", hide: true }
45-
x-clangd-dev: &clangd_dev { name: "llvm", version: "22", packages: "clangd", hide: true }
43+
x-clangd-dev-bionic: &clangd_dev_bionic { name: "llvm", version: "19", packages: "clangd", hide: true }
44+
x-clangd-dev-jammy: &clangd_dev_jammy { name: "llvm", version: "dev", packages: "clangd", hide: true }
45+
x-clangd-dev: &clangd_dev { name: "llvm", version: "dev", packages: "clangd", hide: true }
4646
x-clang-format-cccl: &clang_format_cccl { name: "llvm", version: "21", packages: "clang-format llvm-tools", hide: true }
4747
x-clang-format-rapids: &clang_format_rapids { name: "llvm", version: "16", packages: "clang-format", hide: true }
4848
# Docker outside of Docker used to build python wheels:

0 commit comments

Comments
 (0)