Skip to content

[23794] Fix introduction of no stable API #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richiware merged 4 commits into from
Oct 10, 2025
Merged

[23794] Fix introduction of no stable API #267

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23498a9
Refs #23483. Fix stable api
richiware Oct 8, 2025
df19117
Refs #23483. Add github workflow
richiware Oct 8, 2025
763aebc
Refs #23483. Support swig-version
richiware Oct 8, 2025
5a39027
Refs #23483. Fix type resolution up to swig 4.2.0
richiware Oct 10, 2025
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
7 changes: 6 additions & 1 deletion .github/workflows/reusable-windows-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ on:
description: 'Extra arguments for cmake cli'
required: false
type: string
cmake-version:
description: 'CMake version to install'
required: false
default: '3.24.4'
type: string
ctest-args:
description: 'Extra arguments for ctest cli'
required: false
Expand Down Expand Up @@ -91,7 +96,7 @@ jobs:
- name: Get minimum supported version of CMake
uses: eProsima/eProsima-CI/external/get-cmake@v0
with:
cmakeVersion: '3.24.4'
cmakeVersion: ${{ inputs.cmake-version }}

- name: Install OpenSSL
uses: eProsima/eprosima-CI/windows/install_openssl@v0
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/windows-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,23 @@ jobs:
fastdds-branch: ${{ inputs.fastdds-branch || 'master' }}
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}

windows-ci-stable-abi:
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
strategy:
fail-fast: false
uses: ./.github/workflows/reusable-windows-ci.yml
with:
# It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
os-version: ${{ inputs.os-version || 'windows-2022' }}
vs-toolset: 'v143'
label: '${{ inputs.os-version }}-${{ matrix.vs-toolset }}-stable-api-ci-${{ inputs.fastdds-python-branch }}-${{ inputs.fastdds-branch }}'
colcon-args: ${{ inputs.colcon-args }}
cmake-args: '${{ inputs.cmake-args }} -DUSE_PYTHON_STABLE_ABI=ON'
cmake-version: '3.30.8'
Comment thread
MiguelCompany marked this conversation as resolved.
ctest-args: ${{ inputs.ctest-args }}
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref }}
fastdds-branch: ${{ inputs.fastdds-branch || 'master' }}
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}
8 changes: 4 additions & 4 deletions fastdds_python/src/swig/fastdds/rtps/common/InstanceHandle.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ long hash(const eprosima::fastdds::rtps::InstanceHandle_t& handle)

// Fast-path: bytes
if (PyBytes_Check(seq)) {
if (PyBytes_GET_SIZE(seq) == 16)
if (PyBytes_Size(seq) == 16)
{
const char* b = PyBytes_AS_STRING(seq);
const char* b = PyBytes_AsString(seq);
for (int i = 0; i < 16; ++i) (*self)[i] = (uint8_t)(unsigned char)b[i];
}
else
Expand All @@ -65,9 +65,9 @@ long hash(const eprosima::fastdds::rtps::InstanceHandle_t& handle)
// Fast-path: bytearray
else if (PyByteArray_Check(seq))
{
if (PyByteArray_GET_SIZE(seq) == 16)
if (PyByteArray_Size(seq) == 16)
{
const char* b = PyByteArray_AS_STRING(seq);
const char* b = PyByteArray_AsString(seq);
for (int i = 0; i < 16; ++i) (*self)[i] = (uint8_t)(unsigned char)b[i];
}
else
Expand Down
Loading