Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/create-or-update-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ jobs:
id: commit
run: |
git add build/build.env Containerfile \
distribution/requirements.txt distribution/README.md
distribution/requirements-lock.txt distribution/requirements-lock-konflux.txt \
distribution/README.md
if git diff --cached --quiet; then
echo "::notice::No changes to commit — version may already be set to ${TAG}"
else
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/redhat-distro-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
if: contains(fromJSON('["workflow_dispatch", "schedule"]'), github.event_name)
env:
OGX_VERSION: ${{ env.OGX_COMMIT_SHA }}
run: uv run --with ruamel.yaml build/build.py
run: ./build/run.sh

- name: Build image for testing (${{ matrix.arch }})
id: build
Expand Down Expand Up @@ -381,7 +381,7 @@ jobs:
if: github.event_name == 'workflow_dispatch'
env:
OGX_VERSION: ${{ env.OGX_COMMIT_SHA }}
run: uv run --with ruamel.yaml build/build.py
run: ./build/run.sh

- name: Set up QEMU
uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/test-pr-in-showroom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,7 @@ jobs:
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
echo "Building image: ogx-test:$TAG"

uv venv
source .venv/bin/activate
uv pip install 'ruamel.yaml>=0.18.0'
python3 build/build.py
./build/run.sh
podman build -f Containerfile -t "ogx-test:$TAG" .

- name: Setup CI environment
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/test-upstream-in-showroom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@ jobs:
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
echo "Building image with OGX_VERSION=main: ogx-test:$TAG"

uv venv
source .venv/bin/activate
uv pip install 'ruamel.yaml>=0.18.0'
python3 build/build.py
./build/run.sh
podman build -f Containerfile -t "ogx-test:$TAG" .

- name: Setup CI environment
Expand Down
7 changes: 2 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,11 @@ repos:
hooks:
- id: pkg-gen
name: Distribution Build
entry: ./build/build.py
language: python
entry: ./build/run.sh
language: script
pass_filenames: false
require_serial: true
always_run: true
Comment thread
coderabbitai[bot] marked this conversation as resolved.
additional_dependencies:
- uv>=0.9.0
- ruamel.yaml>=0.18.0

- id: doc-gen
name: Distribution Documentation
Expand Down
8 changes: 4 additions & 4 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# by build/build.py - do not edit manually.
FROM quay.io/opendatahub/odh-midstream-python-base-3-12:latest

ENV UV_INDEX_STRATEGY=unsafe-best-match
ENV UV_TORCH_BACKEND=cpu \
UV_CONFIG_FILE=/dev/null

COPY distribution/constraints.txt ${APP_ROOT}/constraints.txt
COPY distribution/requirements.txt ${APP_ROOT}/requirements.txt
RUN uv pip install --constraint ${APP_ROOT}/constraints.txt -r ${APP_ROOT}/requirements.txt
COPY distribution/requirements-lock.txt ${APP_ROOT}/requirements-lock.txt
RUN uv pip install -r ${APP_ROOT}/requirements-lock.txt

COPY --chmod=755 distribution/install-common.sh ${APP_ROOT}/install-common.sh
ENV DOCLING_ARTIFACTS_PATH="${APP_ROOT}/.cache/docling/models"
Expand Down
8 changes: 4 additions & 4 deletions Containerfile.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM quay.io/opendatahub/odh-midstream-python-base-3-12:latest

ENV UV_INDEX_STRATEGY=unsafe-best-match
ENV UV_TORCH_BACKEND=cpu \
UV_CONFIG_FILE=/dev/null

COPY distribution/constraints.txt ${APP_ROOT}/constraints.txt
COPY distribution/requirements.txt ${APP_ROOT}/requirements.txt
RUN uv pip install --constraint ${APP_ROOT}/constraints.txt -r ${APP_ROOT}/requirements.txt
COPY distribution/requirements-lock.txt ${APP_ROOT}/requirements-lock.txt
RUN uv pip install -r ${APP_ROOT}/requirements-lock.txt

COPY --chmod=755 distribution/install-common.sh ${APP_ROOT}/install-common.sh
ENV DOCLING_ARTIFACTS_PATH="${APP_ROOT}/.cache/docling/models"
Expand Down
1 change: 1 addition & 0 deletions build/build.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
OGX_VERSION=v1.1.3+rhaiv.0
OGX_INSTALL_FROM_SOURCE=true
RHAI_INDEX_URL=https://packages.redhat.com/api/pypi/public-rhai/rhoai/3.5/cpu-ubi9/simple/
Comment thread
derekhiggins marked this conversation as resolved.
Loading
Loading