fix(ci): include ogx-open-client in unified release pipeline - #6205
Conversation
ogx-open-client was built and published ia a separate workflow, publish-openapi-sdk.yml, with no version coupling to the main ogx release. ogx-open-client version was taken from the fallback version of ogx, so it was always ended with `devX`. This commit adds ogx-open-client to the pypi.yml build/test/publish matrix so every ogx release automatically publishes a same-version client SDK. Fixes the standalone publish-openapi-sdk.yml to also derive its version from the trigger tag or an explicit input. To do the above it changes the version assignment in Makefile. Signed-off-by: E Geiger <egeiger@redhat.com>
|
After this PR is merged, we'll need to undo some of the work in #6016, to undo the pattern of try:
from ogx_open_client import OgxClient
except ImportError:
try:
from ogx_client import OgxClientbut we'll need to first merge this, then wait for/trigger another minor release. |
Following comment ogx-ai#6207 (comment) Building the locally-gnerated client SDK as `ogx-client`, moving back from the temporary `ogx-open-client` Signed-off-by: E Geiger <egeiger@redhat.com>
d0d0847 to
144536c
Compare
There was a problem hiding this comment.
can we remove this workflow? Seems duplicative and pypi.yml should be the only place we publish packages from -- per the trusted publishing settings on pypi.
There was a problem hiding this comment.
Thank you, I agree, removed.
…pypi.yml workflow Remove the standalone OpenAPI SDK publishing workflow now that ogx-client is published through the unified pypi.yml workflow alongside other packages. - Delete .github/workflows/publish-openapi-sdk.yml - Remove its CODEOWNERS and workflows README entries - Delete client-sdks/openapi/DEPLOYMENT.md (redundant with unified workflow) - Update client-sdks/openapi/README.md CD and publishing sections to reference pypi.yml, correct workflow name, package name (ogx-client), tag format (v*), and workflow_dispatch inputs Signed-off-by: E Geiger <egeiger@redhat.com>
|
This pull request has merge conflicts that must be resolved before it can be merged. @aegeiger please rebase it. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork |
skamenan7
left a comment
There was a problem hiding this comment.
Please check. Thanks.
| elif [ "$PACKAGES" == "ogx-only" ] && [ "$TYPE" == "local" ]; then | ||
| elif [ "$PACKAGES" == "ogx-only" ] && { [ "$TYPE" == "local" ] || [ "$TYPE" == "openapi-sdk" ]; }; then | ||
| echo "skip=false" >> "$GITHUB_OUTPUT" | ||
| elif [ "$PACKAGES" == "clients-only" ] && [ "$TYPE" == "external" ]; then |
There was a problem hiding this comment.
Nice consolidation work! One thing I noticed: clients-only only matches external, so ogx-client would get skipped in that mode. Same gap in the publish job around line 793. Adding || [ "$TYPE" == "openapi-sdk" ] to both should do it.
Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>
Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>
ollowing PR ogx-ai#6205 the new SDK is not going to be ogx-open-client as ssumed before, rather ogx-client. Assuming switch-over in 1.1.4 igned-off-by: E Geiger <egeiger@redhat.com>
ollowing PR ogx-ai#6205 the new SDK is not going to be ogx-open-client as ssumed before, rather ogx-client. Assuming switch-over in 1.1.4 Signed-off-by: E Geiger <egeiger@redhat.com>
What does this PR do?
ogx-open-client was built and published ia a separate workflow, publish-openapi-sdk.yml, with no version coupling to the main ogx release. ogx-open-client version was taken from the fallback version of ogx, so it was always ended with
devX.This change adds ogx-open-client to the pypi.yml build/test/publish matrix so every ogx release automatically publishes a same-version client SDK. Fixes the standalone publish-openapi-sdk.yml to also derive its version from the trigger tag or an explicit input.
To do the above it changes the version assignment in Makefile.