diff --git a/.github/action-common-python-release/action.yml b/.github/action-common-python-release/action.yml index 2eadd91b..093348dd 100644 --- a/.github/action-common-python-release/action.yml +++ b/.github/action-common-python-release/action.yml @@ -42,7 +42,7 @@ runs: run: | pip install toml python crates/python/scripts/patch_grpc_web.py - cargo update + cargo update -p hyper-proxy qcs-sdk-python-grpc-web # must be build or sdist - if: inputs.maturin-command == 'build' diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml index c752afe0..a268edf1 100644 --- a/.github/workflows/release-python.yml +++ b/.github/workflows/release-python.yml @@ -3,6 +3,8 @@ name: Release Python on: release: types: [published] + push: + branches: [grpc-web-rc] workflow_dispatch: description: "Manually publish release" inputs: @@ -13,12 +15,12 @@ on: jobs: is-python-release: - if: github.event_name == 'workflow_dispatch' || startsWith(github.event.release.tag_name, 'python/v') + if: true || github.event_name == 'workflow_dispatch' || startsWith(github.event.release.tag_name, 'python/v') runs-on: ubuntu-latest steps: - run: echo "Release tag starts with python/v, proceeding with release" should-publish-wheels: - if: (github.event_name == 'workflow_dispatch' && inputs.publishWheels) || (github.event_name == 'release' && !github.event.release.prerelease) + if: true || (github.event_name == 'workflow_dispatch' && inputs.publishWheels) || (github.event_name == 'release' && !github.event.release.prerelease) runs-on: ubuntu-latest steps: - run: echo "Publishing wheels" @@ -120,8 +122,8 @@ jobs: package-name: [qcs-sdk-python, qcs-sdk-python-grpc-web] steps: - uses: actions/download-artifact@v3 - - name: Publish to PyPI - uses: messense/maturin-action@v1 - with: - command: upload - args: --skip-existing wheels_${{ matrix.package-name }}/* + # - name: Publish to PyPI + # uses: messense/maturin-action@v1 + # with: + # command: upload + # args: --skip-existing wheels_${{ matrix.package-name }}/* diff --git a/crates/lib/src/client.rs b/crates/lib/src/client.rs index 58600082..994bbd04 100644 --- a/crates/lib/src/client.rs +++ b/crates/lib/src/client.rs @@ -22,17 +22,18 @@ pub use qcs_api_client_common::configuration::LoadError; pub use qcs_api_client_grpc::channel::Error as GrpcError; pub use qcs_api_client_openapi::apis::Error as OpenApiError; -#[cfg(not(feature = "grpc-web"))] /// A type alias for the underlying gRPC connection used by all gRPC clients within this library. /// It is public so that users can create gRPC clients with different APIs using a "raw" connection /// initialized by this library. This ensures that the exact Tonic version used for such clients /// matches what this library uses. +#[cfg(not(feature = "grpc-web"))] pub type GrpcConnection = RetryService>; -#[cfg(feature = "grpc-web")] + /// A type alias for the underlying gRPC connection used by all gRPC clients within this library. /// It is public so that users can create gRPC clients with different APIs using a "raw" connection /// initialized by this library. This ensures that the exact Tonic version used for such clients /// matches what this library uses. +#[cfg(feature = "grpc-web")] pub type GrpcConnection = GrpcWebWrapperLayerService>>;