Skip to content

fix(ci): regenerate uv.lock for ogx-client 1.2.0 on release-1.2.x#6300

Merged
cdoern merged 2 commits into
ogx-ai:release-1.2.xfrom
cdoern:fix-1.2.x-uvlock
Jul 14, 2026
Merged

fix(ci): regenerate uv.lock for ogx-client 1.2.0 on release-1.2.x#6300
cdoern merged 2 commits into
ogx-ai:release-1.2.xfrom
cdoern:fix-1.2.x-uvlock

Conversation

@cdoern

@cdoern cdoern commented Jul 14, 2026

Copy link
Copy Markdown
Collaborator

Summary

pyproject.toml on release-1.2.x pins ogx-client==1.2.0, but the committed uv.lock still resolved ogx-client 1.1.3 (and carried a stale >=1.1.3 specifier). The pre-commit uv-lock check regenerates the lock and diffs it, so it failed on the branch — this is the pre-commit failure seen on the --insecure backport (#6293).

Change

Regenerate uv.lock to match pyproject.toml:

  • ogx-client 1.1.3 → 1.2.0
  • drop the no-longer-required pyaml transitive dependency

No source changes; lockfile only.

Test plan

uv lock
pre-commit run uv-lock --files uv.lock   # Passed

Separate from the build-job failures on #6293, which are addressed by the install-ogx-client in-repo generation fix (#6297, being backported to release-1.2.x).

🤖 Generated with Claude Code

pyproject.toml pins ogx-client==1.2.0 but the committed uv.lock still
resolved ogx-client 1.1.3 (and carried a stale >=1.1.3 specifier),
so the pre-commit uv-lock check failed on the branch. Regenerate the
lock to match: ogx-client 1.1.3 -> 1.2.0 and drop the no-longer-required
pyaml transitive dependency.

Co-Authored-By: Claude Opus 4.8 <[email protected]>
Signed-off-by: Charlie Doern <[email protected]>
The ogx-client-typescript entry in the pypi.yml build matrix was
commented out on release-1.2.x while its external repo lacked a matching
release branch. That left it as the only entry defining `repo`, so
`repository: ${{ matrix.repo }}` referenced an undefined matrix
property and the actionlint pre-commit hook failed.

The matching release-1.2.x branch now exists in ogx-client-typescript,
so restore the matrix entry to match main. The runtime should-build
guard still skips the TypeScript build, so publish behavior is unchanged;
this only restores the matrix type so actionlint passes.

Co-Authored-By: Claude Opus 4.8 <[email protected]>
Signed-off-by: Charlie Doern <[email protected]>
@cdoern
cdoern merged commit 0ab9550 into ogx-ai:release-1.2.x Jul 14, 2026
17 of 30 checks passed
cdoern added a commit that referenced this pull request Jul 14, 2026
…) (#6302)

## Summary

Backport of #6301 to `release-1.2.x`, enabling the TypeScript client in
the release publish pipeline now that `ogx-ai/ogx-client-typescript` has
a matching `release-1.2.x` branch.

`release-1.2.x` needed **three** edits (one more than #6301 on main,
whose publish-matrix entry was already live):

1. Remove the build `should-build` TEMPORARY skip for
`ogx-client-typescript`.
2. **Restore the `ogx-client-typescript` entry in the publish matrix** —
it was still commented out here; #6300 only restored the *build* matrix
entry (to fix actionlint).
3. Remove the publish `should-publish` TEMPORARY skip.

## Effect

With this on `release-1.2.x`, a `packages: all` (default) or
`clients-only` release run builds **and** publishes
`ogx-client-typescript` to npm, alongside the Python packages. A 1.2.1
cut will then include the TS client.

## Test plan

- `actionlint` pre-commit hook passes on the edited `pypi.yml`.
- The npm build/publish path is exercised on the next release run.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Signed-off-by: Charlie Doern <[email protected]>
Co-authored-by: Claude Opus 4.8 <[email protected]>
pull Bot pushed a commit to Ucg2c3/llama-stack that referenced this pull request Jul 14, 2026
…exist (ogx-ai#6301)

## Summary

Both the build and publish matrices in `pypi.yml` special-cased
`ogx-client-typescript` with an unconditional `skip=true`, added while
the external `ogx-client-typescript` repo lacked matching release
branches:

```bash
# TEMPORARY: skip ogx-client-typescript until external repo has release branch
if [ "$PACKAGE" == "ogx-client-typescript" ]; then
  echo "skip=true" ...
```

Those branches now exist (`main` and `release-1.2.x` in
`ogx-ai/ogx-client-typescript`), so the temporary guard is no longer
needed. Remove both guards (build `should-build` and publish
`should-publish`) so the TypeScript client flows through the normal
`packages` selection (`all` / `clients-only`) like every other package.

No matrix changes needed on `main` — both TS entries were already live
(they're what keeps actionlint happy on `matrix.repo`). This only
removes the runtime skip.

## Effect

- `packages: all` (default) and `packages: clients-only` now build
**and** publish `ogx-client-typescript` to npm.
- Python packages unchanged.

## Backport note

The `release-1.2.x` backport needs one extra change beyond this diff:
its **publish** matrix entry for `ogx-client-typescript` is still
commented out (only the build-matrix entry was restored in ogx-ai#6300), so it
must be uncommented there too.

## Test plan

- `actionlint` pre-commit hook passes on the edited `pypi.yml`.
- The npm build/publish path is exercised on the next
`clients-only`/`all` release run.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Signed-off-by: Charlie Doern <[email protected]>
Co-authored-by: Claude Opus 4.8 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant