Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
22 changes: 0 additions & 22 deletions .github/workflows/build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,6 @@ jobs:
enable-cache: true
prune-cache: false

- name: Install Node.js
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
with:
node-version: '24'

- name: Build mcp-apps
run: |
cd mcp-app
npm install
npm run build:prod

- name: Run uv sync
run: uv sync --locked

Expand Down Expand Up @@ -189,17 +178,6 @@ jobs:
- name: Install uv
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0

- name: Install Node.js
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
with:
node-version: '24'

- name: Build mcp-apps
run: |
cd mcp-app
npm install
npm run build:prod

- name: Pin Python version
run: uv python pin ${{ matrix.python-version }}

Expand Down
19 changes: 2 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,8 @@ jobs:
enable-cache: true
prune-cache: false

- name: Install Node.js
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
with:
node-version: '24'

- name: Install dependencies
run: |
cd mcp-app
npm install
npm run build:prod
cd ..
uv sync --locked --group lint
run: uv sync --locked --group lint

- name: "Show environment"
run: |
Expand Down Expand Up @@ -108,12 +98,7 @@ jobs:
prune-cache: false

- name: Install dependencies
run: |
cd mcp-app
npm install
npm run build:prod
cd ..
uv sync --locked --group test
run: uv sync --locked --group test

- name: Show environment
run: |
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/ci_installation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,6 @@ jobs:
enable-cache: true
prune-cache: false

- name: Install Node.js
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
with:
node-version: '24'

- name: Build mcp-app
run: |
cd mcp-app
npm install
npm run build:prod

- name: Run Installation and Verification
shell: bash
env:
Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,8 @@ jobs:
enable-cache: true
prune-cache: false

- name: Install Node.js
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
with:
node-version: '24'

- name: Install dependencies
run: |
cd mcp-app
npm install
npm run build:prod
cd ..
uv sync --locked --group docs
run: uv sync --locked --group docs

- name: Generate tool documentation
run: uv run --locked python scripts/generate_tool_docs.py
Expand Down
13 changes: 2 additions & 11 deletions .gitlab/ci/eval-gatekeeper.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ==========================================
# EVAL WORKFLOW - SETUP
# ==========================================
setup-uv-and-mcp-apps:
setup-uv:
stage: setup
image: images.paas.redhat.com/it-cloud-ocp-proxy-lib/python:3.14
variables:
Expand All @@ -10,18 +10,9 @@ setup-uv-and-mcp-apps:
# Install uv
- export PYTHONUSERBASE=$CI_PROJECT_DIR/.local
- pip install --user uv

# Install nvm to set up node and npm
- curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.4/install.sh | bash
- \. "$HOME/.nvm/nvm.sh"
- nvm install 24

# Generate the bundled html file
- cd mcp-app && npm install && npm run build:prod
artifacts:
paths:
- .local/
- mcp-app/dist/
expire_in: 1 hour

download-secure-files:
Expand All @@ -45,7 +36,7 @@ download-secure-files:
stage: eval
image: images.paas.redhat.com/it-cloud-ocp-proxy-lib/python:3.14
needs:
- job: setup-uv-and-mcp-apps
- job: setup-uv
artifacts: true
- job: download-secure-files
artifacts: true
Expand Down
16 changes: 1 addition & 15 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@ FROM base as build

RUN microdnf -y --nodocs --setopt=install_weak_deps=0 install \
git \
nodejs24-npm \
python3.12 \
python3.12-pip \
python-unversioned-command \
&& microdnf clean all \
&& alternatives --install /usr/bin/node node /usr/bin/node-24 24 \
&& alternatives --install /usr/bin/npm npm /usr/bin/npm-24 24
&& microdnf clean all

ARG PSEUDO_VERSION=0.1.0a

Expand All @@ -30,17 +27,6 @@ ENV SETUPTOOLS_SCM_PRETEND_VERSION=${PSEUDO_VERSION}
# the release version.
ADD uv.lock pyproject.toml README.md "$UV_PROJECT"
ADD src/ "$UV_PROJECT"/src/
ADD mcp-app/ "$UV_PROJECT"/mcp-app/

# Build the HTML resource for our mcp-app; using npm rebuild
# here is a workaround for a race condition where the
# downloading the esbuild binary and running it immediately
# gave an ETXTBUSY error.
RUN cd "$UV_PROJECT"/mcp-app/ \
&& npm ci --ignore-scripts \
&& sync \
&& npm rebuild \
&& npm run build:prod

# Install the application in its own virtual environment
RUN python -m venv /opt/venvs/uv \
Expand Down
2 changes: 0 additions & 2 deletions mcp-app/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion mcp-app/.npmrc

This file was deleted.

Loading