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

ci: upgrade to Fedora 41 #59595

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

ci: upgrade to Fedora 41 #59595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e5454c
ci: upgrade to Fedora 41
t0b3 Sep 6, 2024
804ff34
ci: omit compiler warning on deprecated declarations
t0b3 Nov 25, 2024
71de08e
ci: temporary workaround to sip ABI < 13.9 with sip >= 6.9.0
t0b3 Dec 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
4 changes: 2 additions & 2 deletions .docker/qgis3-qt6-build-deps.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG DISTRO_VERSION=39
ARG DISTRO_VERSION=41

FROM fedora:${DISTRO_VERSION} as binary-for-oracle
MAINTAINER Matthias Kuhn <[email protected]>
Expand Down Expand Up @@ -72,7 +72,7 @@ RUN dnf -y --refresh install \
qtkeychain-qt6-devel \
qwt-qt6-devel \
qscintilla-qt6-devel \
sip6 \
sip6-6.8.6-2.fc41.noarch \
spatialindex-devel \
sqlite-devel \
unzip \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
experimental: false
unity-builds: ON

- distro-version: '39'
- distro-version: '41'
qt-version: 6
run-tests: true
with-qt6: ON
Expand Down Expand Up @@ -251,7 +251,7 @@ jobs:
docker-target: binary-only

- qt-version: 6
distro-version: 39
distro-version: 41
docker-target: binary-only

- qt-version: 5
Expand Down
5 changes: 5 additions & 0 deletions src/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2192,6 +2192,11 @@ else()
endif()
endif()

# Workaround CLANG deprecation warning
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set_source_files_properties(painting/qgsmaskpaintdevice.cpp PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
t0b3 marked this conversation as resolved.
Show resolved Hide resolved
endif()

# Generate cpp+header file from .proto file using "protoc" tool (to support MVT encoding of vector tiles)
protobuf_generate_cpp(VECTOR_TILE_PROTO_SRCS VECTOR_TILE_PROTO_HDRS vectortile/vector_tile.proto)
set(QGIS_CORE_SRCS ${QGIS_CORE_SRCS} ${VECTOR_TILE_PROTO_SRCS})
Expand Down
Loading