Skip to content

Commit 6d6f0f6

Browse files
committed
remove more unnecessary gha-tools installs
1 parent 7206236 commit 6d6f0f6

File tree

3 files changed

+21
-23
lines changed

3 files changed

+21
-23
lines changed

.github/workflows/test-notebooks.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023-2025, NVIDIA CORPORATION.
1+
# Copyright (c) 2023-2026, NVIDIA CORPORATION.
22
name: Test notebooks
33

44
on:
@@ -45,9 +45,6 @@ permissions:
4545
security-events: none
4646
statuses: none
4747

48-
env:
49-
GHA_TOOLS_DIR: /home/rapids/.local/bin # Workaround for https://github.com/actions/runner/issues/2411
50-
5148
jobs:
5249
test:
5350
strategy:
@@ -79,8 +76,7 @@ jobs:
7976
git
8077
- name: Install gha-tools
8178
run: |
82-
mkdir -p "$GHA_TOOLS_DIR"
83-
curl -s -L 'https://github.com/rapidsai/gha-tools/releases/latest/download/tools.tar.gz' | tar -xz -C "$GHA_TOOLS_DIR"
79+
context/build-scripts/install-gha-tools
8480
- name: Checkout code
8581
uses: actions/checkout@v6
8682
with:
@@ -90,7 +86,6 @@ jobs:
9086
uses: rapidsai/shared-actions/rapids-github-info@main
9187
- name: Print environment
9288
run: |
93-
PATH="$PATH:$GHA_TOOLS_DIR"
9489
rapids-print-env
9590
rapids-logger "nvidia-smi"
9691
nvidia-smi
@@ -99,7 +94,6 @@ jobs:
9994
- name: Install awscli
10095
if: '!cancelled()'
10196
run: |
102-
PATH="$PATH:$GHA_TOOLS_DIR"
10397
rapids-mamba-retry install -n base awscli
10498
- uses: aws-actions/configure-aws-credentials@v5
10599
if: '!cancelled()'
@@ -110,5 +104,4 @@ jobs:
110104
- name: Upload notebook test outputs
111105
if: '!cancelled()'
112106
run: |
113-
PATH="$PATH:$GHA_TOOLS_DIR"
114107
rapids-upload-to-s3 test_notebooks_output_${{ inputs.ARCH }}_cuda${{ inputs.CUDA_VER }}_py${{ inputs.PYTHON_VER }}_${{ inputs.GPU }}-${{ inputs.DRIVER }}.tar.gz /home/rapids/notebooks_output

context/scripts/install-gha-tools

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
set -e -u -o pipefail
99

10-
# allow this to be overridden so it can be re-used in GitHub Actions workflows
11-
GHA_TOOLS_DIR="${GHA_TOOLS_DIR:-/usr/local/bin}"
10+
GHA_TOOLS_INSTALL_DIR=/usr/local/bin
1211

1312
# install wget
1413
wget_preinstalled=true
@@ -26,7 +25,7 @@ if ! type -f wget >/dev/null; then
2625
fi
2726

2827
# install gha-tools
29-
wget -q https://github.com/rapidsai/gha-tools/releases/latest/download/tools.tar.gz -O - | tar -xz -C "${GHA_TOOLS_DIR}"
28+
wget -q https://github.com/rapidsai/gha-tools/releases/latest/download/tools.tar.gz -O - | tar -xz -C "${GHA_TOOLS_INSTALL_DIR}"
3029

3130
# uninstall wget
3231
if [[ "${wget_preinstalled}" != "true" ]]; then

cuvs-bench/cpu/Dockerfile

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,23 @@ chmod 777 /data
2222
echo ". /opt/conda/etc/profile.d/conda.sh; conda activate base" >> /etc/bash.bashrc
2323
EOF
2424

25-
# we need perl temporarily for the remaining benchmark perl scripts
26-
RUN <<EOF
27-
apt-get update
28-
PACKAGES_TO_INSTALL=(
29-
perl
30-
wget
31-
)
32-
apt-get install -y --no-install-recommends \
33-
"${PACKAGES_TO_INSTALL[@]}"
34-
wget --quiet https://github.com/rapidsai/gha-tools/releases/latest/download/tools.tar.gz -O - | tar -xz -C /usr/local/bin
35-
rm -rf /var/lib/apt/lists/*
25+
RUN \
26+
--mount=type=bind,source=scripts,target=/tmp/build-scripts \
27+
<<EOF
28+
# we need perl temporarily for the remaining benchmark perl scripts
29+
apt-get update
30+
PACKAGES_TO_INSTALL=(
31+
perl
32+
wget
33+
)
34+
apt-get install -y --no-install-recommends \
35+
"${PACKAGES_TO_INSTALL[@]}"
36+
37+
# install gha-tools for rapids-mamba-retry
38+
/tmp/build-scripts/install gha-tools
39+
40+
# clean up
41+
rm -rf /var/lib/apt/lists/*
3642
EOF
3743

3844
# update everything before other environment changes, to ensure mixing

0 commit comments

Comments
 (0)