Skip to content

Commit 1e85404

Browse files
authored
Attempt to resolve workflows for docs build, conda publishing, and di… (#1356)
1 parent 30ca621 commit 1e85404

4 files changed

Lines changed: 27 additions & 15 deletions

File tree

.github/actions/determine-version/action.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,26 @@ runs:
2828
shell: bash
2929
run: |
3030
VERSION=""
31+
INPUT_VERSION="${{ inputs.version }}"
32+
INPUT_BRANCH_NAME="${{ inputs.branch-name }}"
33+
INPUT_DATE_FORMAT="${{ inputs.date-format }}"
3134
3235
# Priority 1: Explicit version input
33-
if [ -n "${{ inputs.version }}" ]; then
34-
VERSION="${{ inputs.version }}"
36+
if [ -n "${INPUT_VERSION}" ]; then
37+
VERSION="${INPUT_VERSION}"
3538
echo "Using explicit version: $VERSION"
3639
3740
# Priority 2: Extract from branch name (for release/* branches)
38-
elif [ -n "${{ inputs.branch-name }}" ]; then
39-
if [[ "${{ inputs.branch-name }}" == release/* ]]; then
40-
VERSION="${{ inputs.branch-name }#release/}"
41+
elif [ -n "${INPUT_BRANCH_NAME}" ]; then
42+
if [[ "${INPUT_BRANCH_NAME}" == release/* ]]; then
43+
VERSION="${INPUT_BRANCH_NAME#release/}"
4144
echo "Extracted version from branch: $VERSION"
4245
fi
4346
fi
4447
4548
# Priority 3: Generate from date
4649
if [ -z "$VERSION" ]; then
47-
VERSION=$(date +'${{ inputs.date-format }}')
50+
VERSION="$(date +"${INPUT_DATE_FORMAT}")"
4851
echo "Generated version from date: $VERSION"
4952
fi
5053

.github/workflows/reusable-conda-publish.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ jobs:
2626
runs-on: ubuntu-latest
2727

2828
steps:
29+
- name: Set up Python (for anaconda-client)
30+
uses: actions/setup-python@v5
31+
with:
32+
python-version: '3.x'
33+
2934
- name: Download artifacts (if available)
3035
if: ${{ inputs.package-path == './conda/output_conda_channel/linux-64/*.conda' }}
3136
uses: actions/download-artifact@v4
@@ -34,6 +39,11 @@ jobs:
3439
path: ./conda/output_conda_channel
3540
continue-on-error: true
3641

42+
- name: Install anaconda-client
43+
run: |
44+
python -m pip install --upgrade pip
45+
python -m pip install anaconda-client
46+
3747
- name: Validate channel
3848
run: |
3949
if [[ "${{ inputs.channel }}" != "dev" && "${{ inputs.channel }}" != "main" ]]; then

.github/workflows/scheduled-nightly.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
schedule:
55
# Runs every day at 11:30PM UTC
66
- cron: "30 23 * * *"
7-
push:
8-
branches:
9-
- main
107
workflow_dispatch:
118
inputs:
129
skip-docker:

Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,14 @@ CMD ["/bin/bash"]
226226
FROM nv_ingest_install AS docs
227227

228228
# Install dependencies needed for docs generation
229-
# Clear stale apt lists and use --fix-missing to handle repository issues
230-
RUN rm -rf /var/lib/apt/lists/* \
231-
&& apt-get update --fix-missing \
232-
&& apt-get install -y --no-install-recommends make \
233-
&& apt-get clean \
234-
&& rm -rf /var/lib/apt/lists/*
229+
#
230+
# NOTE: The nv_ingest_install base image may carry a broken apt/dpkg state
231+
# (e.g., partially-installed libreoffice dependencies). Installing `make`
232+
# via conda avoids apt entirely and is more reliable on CI runners.
233+
RUN --mount=type=cache,target=/opt/conda/pkgs \
234+
source activate nv_ingest_runtime \
235+
&& mamba install -y make \
236+
&& mamba clean -afy
235237

236238
COPY docs docs
237239

0 commit comments

Comments
 (0)