From 3a0871f5e574a463266e13b23ac29f45ca29d12e Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 15 Mar 2024 18:36:47 -0500 Subject: [PATCH] Fix update-version.sh for ucxx. (#247) * Fix update-version.sh for ucxx version. * Fix feature versions. --- USAGE.md | 2 +- ci/release/update-version.sh | 4 ++-- .../rapids-build-utils/opt/rapids-build-utils/manifest.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/USAGE.md b/USAGE.md index a17551e5..e06c7f89 100644 --- a/USAGE.md +++ b/USAGE.md @@ -23,7 +23,7 @@ The pre-built images can be used as the `"image"`, or as the base of a Dockerfil You can also build a custom devcontainer by composing individual features: -
devcontainer.json using individual features
{
  "image": "ubuntu:22.04",
  "features": {
    "ghcr.io/rapidsai/devcontainers/features/cmake:24.06": {},
    "ghcr.io/rapidsai/devcontainers/features/ninja:24.06": {},
    "ghcr.io/rapidsai/devcontainers/features/sccache:24.06": {
      "version": "0.5.4"
    }
  },
  "overrideFeatureInstallOrder": [
    "ghcr.io/rapidsai/devcontainers/features/cmake",
    "ghcr.io/rapidsai/devcontainers/features/ninja",
    "ghcr.io/rapidsai/devcontainers/features/sccache"
  ],
  "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
  "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind"
}
+
devcontainer.json using individual features
{
  "image": "ubuntu:22.04",
  "features": {
    "ghcr.io/rapidsai/devcontainers/features/cmake:24.6": {},
    "ghcr.io/rapidsai/devcontainers/features/ninja:24.6": {},
    "ghcr.io/rapidsai/devcontainers/features/sccache:24.6": {
      "version": "0.5.4"
    }
  },
  "overrideFeatureInstallOrder": [
    "ghcr.io/rapidsai/devcontainers/features/cmake",
    "ghcr.io/rapidsai/devcontainers/features/ninja",
    "ghcr.io/rapidsai/devcontainers/features/sccache"
  ],
  "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
  "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind"
}
> **NOTE:** Feature updates published since your most recent image build will invalidate your docker image layer cache, meaning it can take the [devcontainers CLI](https://github.com/devcontainers/cli) longer to initialize containers composed from individual features. diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 4d170d44..c745ee0a 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -38,14 +38,14 @@ function sed_runner() { } sed_runner "s/devcontainers:.*-cpp/devcontainers:${NEXT_SHORT_TAG}-cpp/g" USAGE.md -sed_runner "s|features/\([[:alnum:]]\+\):[[:digit:]]\+\.[[:digit:]]\+\"|features/\1:${NEXT_SHORT_TAG}\"|g" USAGE.md +sed_runner "s|features/\([[:alnum:]]\+\):[[:digit:]]\+\.[[:digit:]]\+\"|features/\1:${NEXT_SHORT_TAG_PEP440}\"|g" USAGE.md for file in $(find .devcontainer -name devcontainer.json); do sed_runner "s|rapidsai/devcontainers:.*-cpp|rapidsai/devcontainers:${NEXT_SHORT_TAG}-cpp|g" "$file" done sed_runner "s/branch-[[:digit:]]\{2\}\.[[:digit:]]\+/branch-${NEXT_SHORT_TAG}/g" ./features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml -sed_runner "s/branch-0.[[:digit:]]\+.*/branch-${NEXT_UCX_PY_VERSION}/g" ./features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml +sed_runner "s/branch-0.[[:digit:]]\+/branch-${NEXT_UCX_PY_VERSION}/g" ./features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml for file in $(find features -name devcontainer-feature.json); do tmp=$(mktemp) diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml index 4a1ba9e9..eed376b6 100755 --- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml +++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml @@ -19,7 +19,7 @@ repos: - name: ucxx path: ucxx - git: {<<: *git_defaults, repo: ucxx, tag: branch-0.38 + git: {<<: *git_defaults, repo: ucxx, tag: branch-0.38} cpp: - name: ucxx sub_dir: cpp