diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a8c8c989..ebbff66d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,11 +14,11 @@ jobs: fail-fast: false matrix: include: - # UBUNTU 24.04 - CASTXML EPIC 0 + # UBUNTU 22.04 - CASTXML EPIC 0 - os: ubuntu-22.04 compiler: gcc version: "11" - python-version: "3.9" + python-version: "3.13" castxml: "castxml" castxml-epic: 0 cppstd: "-std=c++98" @@ -26,47 +26,64 @@ jobs: - os: ubuntu-22.04 compiler: gcc version: "11" + python-version: "3.13" + castxml: "castxml" + castxml-epic: 1 + cppstd: "-std=c++98" + + # UBUNTU 24.04 - CASTXML EPIC 0 + - os: ubuntu-24.04 + compiler: gcc + version: "13" + python-version: "3.9" + castxml: "castxml" + castxml-epic: 0 + cppstd: "-std=c++98" + + - os: ubuntu-24.04 + compiler: gcc + version: "13" python-version: "3.10" castxml: "castxml" castxml-epic: 0 cppstd: "-std=c++98" - - os: ubuntu-22.04 + - os: ubuntu-24.04 compiler: gcc - version: "11" + version: "13" python-version: "3.11" castxml: "castxml" castxml-epic: 0 cppstd: "-std=c++98" - - os: ubuntu-22.04 + - os: ubuntu-24.04 compiler: gcc - version: "11" + version: "13" python-version: "3.12" castxml: "castxml" castxml-epic: 0 cppstd: "-std=c++98" - - os: ubuntu-22.04 + - os: ubuntu-24.04 compiler: gcc - version: "11" + version: "13" python-version: "3.13" castxml: "castxml" castxml-epic: 0 cppstd: "-std=c++98" # UBUNTU 24.04 - CASTXML EPIC 1 - - os: ubuntu-22.04 + - os: ubuntu-24.04 compiler: gcc - version: "11" + version: "13" python-version: "3.13" castxml: "castxml" castxml-epic: 1 cppstd: "-std=c++98" - - os: ubuntu-22.04 + - os: ubuntu-24.04 compiler: gcc - version: "11" + version: "13" python-version: "3.13" castxml: "castxml" castxml-epic: 1 @@ -100,7 +117,7 @@ jobs: run: pycodestyle . --exclude=docs - name: Setup castxml for Linux - if: matrix.os == 'ubuntu-22.04' && matrix.castxml == 'castxml' + if: contains(matrix.os, 'ubuntu') && matrix.castxml == 'castxml' run: | wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/bdbb67a10c5f8d1b738cd19cb074f409d4803e8077cb8c1072ef4eaf738fa871a73643f9c8282d58cae28d188df842c82ad6620b6d590b0396a0172a27438dce/download | tar zxf - -C ~/ - name: Setup castxml for Mac diff --git a/src/pygccxml/parser/project_reader.py b/src/pygccxml/parser/project_reader.py index d7bf7c99..b37d8665 100644 --- a/src/pygccxml/parser/project_reader.py +++ b/src/pygccxml/parser/project_reader.py @@ -548,11 +548,13 @@ def _relink_declarated_types(self, leaved_classes, declarated_types): if name == "rebind, void *> >": continue + if name == "type": + continue msg = [] msg.append( "Unable to find out actual class definition: '%s'." % - decl_wrapper_type.declaration._name) + name) msg.append(( "Class definition has been changed from one " + "compilation to an other."))