Skip to content
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

Fix: build with QTSERIALPORT=false #56953

Merged
merged 2 commits into from
Mar 24, 2024
Merged

Fix: build with QTSERIALPORT=false #56953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57517b7
fix: build without qtserialport
t0b3 Mar 24, 2024
27e8f96
fix: push docker image only if GH actor == qgis
t0b3 Mar 24, 2024
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
12 changes: 6 additions & 6 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
echo QT_VERSION: ${QT_VERSION}

- name: Login to Docker Hub
if: ${{ github.event_name == 'push' }}
if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
t0b3 marked this conversation as resolved.
Show resolved Hide resolved
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
Expand All @@ -129,7 +129,7 @@ jobs:
context: .
file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
tags: qgis/qgis3-build-deps-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}:${{ github.event.pull_request.base.ref || github.ref_name }}
push: ${{ github.event_name == 'push' }}
push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
pull: true
build-args:
DISTRO_VERSION=${{ matrix.distro-version }}
Expand Down Expand Up @@ -347,7 +347,7 @@ jobs:
echo CTEST_BUILD_NAME: ${CTEST_BUILD_NAME}

- name: Login to Docker Hub
if: ${{ github.event_name == 'push' }}
if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
Expand All @@ -360,7 +360,7 @@ jobs:
context: .
file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
tags: qgis/qgis3-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }}
push: ${{ github.event_name == 'push' }}
push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
pull: true
target: ${{ matrix.docker-target }}
build-args:
Expand Down Expand Up @@ -458,7 +458,7 @@ jobs:
fetch-depth: 2

- name: Login to Docker Hub
if: ${{ github.event_name == 'push' }}
if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
Expand All @@ -471,7 +471,7 @@ jobs:
context: .
file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
tags: qgis/qgis3-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }}
push: ${{ github.event_name == 'push' }}
push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
pull: true
target: ${{ matrix.docker-target }}
build-args:
Expand Down
19 changes: 11 additions & 8 deletions python/PyQt6/core/core.sip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,22 +91,25 @@ done:

%End

%Feature HAVE_GUI
%Feature HAVE_QTSERIALPORT
%Feature HAVE_QTPRINTER
%Feature ANDROID
%Feature VECTOR_MAPPED_TYPE
%Feature HAVE_WEBENGINE_SIP
%Feature PYQT6

%Import QtXml/QtXmlmod.sip
%Import QtNetwork/QtNetworkmod.sip
%Import QtSql/QtSqlmod.sip

%Import QtPrintSupport/QtPrintSupportmod.sip
%Import QtWidgets/QtWidgetsmod.sip
%Import QtPositioning/QtPositioningmod.sip
%Import QtSerialPort/QtSerialPortmod.sip

%Feature HAVE_GUI
%Feature HAVE_QTSERIALPORT
%Feature HAVE_QTPRINTER
%Feature ANDROID
%Feature VECTOR_MAPPED_TYPE
%Feature HAVE_WEBENGINE_SIP
%Feature PYQT6
%If (HAVE_QTSERIALPORT)
%Import QtSerialPort/QtSerialPortmod.sip
%End

%Include conversions.sip
%Include qgsexception.sip
Expand Down
17 changes: 10 additions & 7 deletions python/core/core.sip.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,24 @@ done:

%End

%Feature HAVE_GUI
%Feature HAVE_QTSERIALPORT
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need all the other features?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@m-kuhn hmm, that's a good question - It was already there... just tell me if you feel some of them should be removed in this PR as well 👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see, you moved them up

Copy link
Contributor Author

@t0b3 t0b3 Mar 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@m-kuhn sure they were ... just a few lines lower ... and they need to be introduced before %If (<your_feature>) that's why I suggest to shift them all together

%Feature HAVE_QTPRINTER
%Feature ANDROID
%Feature VECTOR_MAPPED_TYPE
%Feature HAVE_WEBENGINE_SIP

%Import QtXml/QtXmlmod.sip
%Import QtNetwork/QtNetworkmod.sip
%Import QtSql/QtSqlmod.sip

%Import QtPrintSupport/QtPrintSupportmod.sip
%Import QtWidgets/QtWidgetsmod.sip
%Import QtPositioning/QtPositioningmod.sip
%Import QtSerialPort/QtSerialPortmod.sip

%Feature HAVE_GUI
%Feature HAVE_QTSERIALPORT
%Feature HAVE_QTPRINTER
%Feature ANDROID
%Feature VECTOR_MAPPED_TYPE
%Feature HAVE_WEBENGINE_SIP
%If (HAVE_QTSERIALPORT)
%Import QtSerialPort/QtSerialPortmod.sip
%End

%Include conversions.sip
%Include qgsexception.sip
Expand Down
Loading