Skip to content

Commit ed4646f

Browse files
authored
Merge branch 'main' into 26.02-cagra-extend
2 parents dc3f333 + 7f539ae commit ed4646f

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

.github/workflows/build.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- "main"
7+
- "release/*"
78
tags:
89
- v[0-9][0-9].[0-9][0-9].[0-9][0-9]
910
workflow_dispatch:
@@ -63,7 +64,7 @@ jobs:
6364
date: ${{ inputs.date }}
6465
container_image: "rapidsai/ci-wheel:26.04-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
6566
node_type: "cpu16"
66-
# requires_license_builder: false
67+
requires_license_builder: true
6768
script: "ci/build_standalone_c.sh"
6869
artifact-name: "libcuvs_c_${{ matrix.cuda_version }}_${{ matrix.arch }}.tar.gz"
6970
file_to_upload: "libcuvs_c.tar.gz"

.github/workflows/pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ jobs:
196196
date: ${{ inputs.date }}_c
197197
container_image: "rapidsai/ci-wheel:26.04-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
198198
node_type: "cpu16"
199-
# requires_license_builder: false
199+
requires_license_builder: true
200200
script: "ci/build_standalone_c.sh --build-tests"
201201
artifact-name: "libcuvs_c_${{ matrix.cuda_version }}_${{ matrix.arch }}.tar.gz"
202202
file_to_upload: "libcuvs_c.tar.gz"

ci/build_standalone_c.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION.
2+
# SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
33
# SPDX-License-Identifier: Apache-2.0
44

55
set -euo pipefail
@@ -93,10 +93,8 @@ fi
9393

9494

9595
rapids-logger "Begin gathering licenses"
96-
cp LICENSE c/build/install/
97-
if [ -e "./tool/extract_licenses_via_spdx.py" ]; then
98-
python ./tool/extract_licenses_via_spdx.py "." --with-licenses >> c/build/install/LICENSE
99-
fi
96+
rapids-pip-retry install git+https://github.com/rapidsai/spdx-license-builder.git
97+
license-builder . --output-json c/build/install/licenses.json --output-txt c/build/install/LICENSE
10098

10199
rapids-logger "Begin c tarball creation"
102100
tar czf libcuvs_c.tar.gz -C c/build/install/ .

0 commit comments

Comments
 (0)