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.

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 qgis server fcgi response destructor #59632

Draft
wants to merge 15 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .ci/ogc/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

mkdir /usr/src/qgis/build
mkdir -p /usr/src/qgis/build
cd /usr/src/qgis/build || exit 1

export CCACHE_TEMPDIR=/tmp
Expand All @@ -14,6 +14,7 @@ ccache -M 2.0G
ccache -z

cmake -GNinja \
-DCMAKE_BUILD_TYPE=Debug \
-DUSE_CCACHE=ON \
-DWITH_QUICK=OFF \
-DWITH_3D=OFF \
Expand Down
3 changes: 3 additions & 0 deletions .ci/ogc/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ services:
networks:
- qgis
privileged: true
environment:
QGIS_DEBUG: 5


networks:
qgis:
Expand Down
216 changes: 108 additions & 108 deletions .github/workflows/build-macos-qt6.yml
Original file line number Diff line number Diff line change
@@ -1,108 +1,108 @@
---
name: 🍎 Build - MacOS Qt6
on:
# push:
# branches:
# - main
# pull_request:
# release:
# types: ['published']
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
matrix:
include:
# - os: macos-13
# triplet: x64-osx
# deployment-target: "10.15"
- os: macos-14
triplet: arm64-osx-dynamic-release
deployment-target: "11.0"
name: build (macos)
runs-on: ${{ matrix.os }}

steps:
- name: 🐣 Checkout
uses: actions/checkout@v4

- name: 🐩 Install CMake and Ninja
uses: lukka/get-cmake@latest
with:
# Pin to specific version to avoid rebuilding too often
# Also helps to avoid spurious build failures like https://github.com/qgis/QGIS/pull/47098
cmakeVersion: 3.30.4

- name: 🎡 Setup vcpkg
id: setup-vcpkg
uses: ./.github/actions/setup-vcpkg

- name: 🔨 Prepare build env
run: |
brew install automake bison flex gnu-sed create-dmg autoconf-archive nasm libtool fdupes
echo $(brew --prefix bison)/bin >> $GITHUB_PATH
echo $(brew --prefix flex)/bin >> $GITHUB_PATH
echo $(brew --prefix libtool)/bin >> $GITHUB_PATH

- uses: actions/setup-python@v5
with:
python-version: '3.11'

- name: 🍭 Setup XCode
uses: maxim-lobanov/[email protected]
with:
xcode-version: latest-stable

- name: 🌱 Install dependencies and generate project files
run: |
echo "VCPKG_ROOT: ${VCPKG_ROOT}"

# Install first only with binarycaching, then deduplicate binaries and replace copies with symlinks.
# Nuget doesn't understand the symlink concept
cmake -S . \
-G Ninja \
-B build \
-D WITH_VCPKG=ON \
-D BUILD_WITH_QT6=ON \
-D WITH_QTWEBKIT=OFF \
-D WITH_BINDINGS=ON \
-D QGIS_MACAPP_FRAMEWORK=OFF \
-D VCPKG_TARGET_TRIPLET="${{ matrix.triplet }}" \
-D VCPKG_HOST_TRIPLET="${{ matrix.triplet }}" \
-D VCPKG_INSTALL_OPTIONS="--only-binarycaching" \
-D NUGET_USERNAME=${{ github.actor }} \
-D NUGET_TOKEN=${{ secrets.GITHUB_TOKEN }} || true

fdupes -r -1 build/vcpkg_installed/arm64-osx-dynamic/lib | grep libQt | while read line; do master=""; for file in ${line[*]}; do if [[ "x${master}" == "x" ]]; then master=$file; else rm "${file}"; ln -s $(basename "${master}") "${file}"; fi; done; done

cmake -D VCPKG_INSTALL_OPTIONS="" build

- name: 📑 Upload vcpkg build logs
uses: actions/upload-artifact@v4
if: failure()
with:
name: build-logs-${{ matrix.triplet }}
path: |
${{ env.VCPKG_ROOT }}/buildtrees/**/*.log

- name: 📦 Create SDK
if: github.event_name == 'workflow_dispatch' || github.event_name == 'release'
run: |
./build/_deps/vcpkg-src/vcpkg export --zip --output-dir=./sdk --x-install-root=./build/vcpkg_installed --x-manifest-root=vcpkg

- name: 📤 Upload sdk
if: github.event_name == 'workflow_dispatch' || github.event_name == 'release'
uses: actions/upload-artifact@v4
with:
name: kadas-albireo2-sdk-${{ matrix.triplet }}
path: |
sdk/vcpkg-export-*.zip

- name: 🌋 Build
run: |
cmake --build build
# ---
# name: 🍎 Build - MacOS Qt6
# on:
# # push:
# # branches:
# # - main
# # pull_request:
# # release:
# # types: ['published']
# workflow_dispatch:

# concurrency:
# group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
# cancel-in-progress: true

# jobs:
# build:
# strategy:
# matrix:
# include:
# # - os: macos-13
# # triplet: x64-osx
# # deployment-target: "10.15"
# - os: macos-14
# triplet: arm64-osx-dynamic-release
# deployment-target: "11.0"
# name: build (macos)
# runs-on: ${{ matrix.os }}

# steps:
# - name: 🐣 Checkout
# uses: actions/checkout@v4

# - name: 🐩 Install CMake and Ninja
# uses: lukka/get-cmake@latest
# with:
# # Pin to specific version to avoid rebuilding too often
# # Also helps to avoid spurious build failures like https://github.com/qgis/QGIS/pull/47098
# cmakeVersion: 3.30.4

# - name: 🎡 Setup vcpkg
# id: setup-vcpkg
# uses: ./.github/actions/setup-vcpkg

# - name: 🔨 Prepare build env
# run: |
# brew install automake bison flex gnu-sed create-dmg autoconf-archive nasm libtool fdupes
# echo $(brew --prefix bison)/bin >> $GITHUB_PATH
# echo $(brew --prefix flex)/bin >> $GITHUB_PATH
# echo $(brew --prefix libtool)/bin >> $GITHUB_PATH

# - uses: actions/setup-python@v5
# with:
# python-version: '3.11'

# - name: 🍭 Setup XCode
# uses: maxim-lobanov/[email protected]
# with:
# xcode-version: latest-stable

# - name: 🌱 Install dependencies and generate project files
# run: |
# echo "VCPKG_ROOT: ${VCPKG_ROOT}"

# # Install first only with binarycaching, then deduplicate binaries and replace copies with symlinks.
# # Nuget doesn't understand the symlink concept
# cmake -S . \
# -G Ninja \
# -B build \
# -D WITH_VCPKG=ON \
# -D BUILD_WITH_QT6=ON \
# -D WITH_QTWEBKIT=OFF \
# -D WITH_BINDINGS=ON \
# -D QGIS_MACAPP_FRAMEWORK=OFF \
# -D VCPKG_TARGET_TRIPLET="${{ matrix.triplet }}" \
# -D VCPKG_HOST_TRIPLET="${{ matrix.triplet }}" \
# -D VCPKG_INSTALL_OPTIONS="--only-binarycaching" \
# -D NUGET_USERNAME=${{ github.actor }} \
# -D NUGET_TOKEN=${{ secrets.GITHUB_TOKEN }} || true

# fdupes -r -1 build/vcpkg_installed/arm64-osx-dynamic/lib | grep libQt | while read line; do master=""; for file in ${line[*]}; do if [[ "x${master}" == "x" ]]; then master=$file; else rm "${file}"; ln -s $(basename "${master}") "${file}"; fi; done; done

# cmake -D VCPKG_INSTALL_OPTIONS="" build

# - name: 📑 Upload vcpkg build logs
# uses: actions/upload-artifact@v4
# if: failure()
# with:
# name: build-logs-${{ matrix.triplet }}
# path: |
# ${{ env.VCPKG_ROOT }}/buildtrees/**/*.log

# - name: 📦 Create SDK
# if: github.event_name == 'workflow_dispatch' || github.event_name == 'release'
# run: |
# ./build/_deps/vcpkg-src/vcpkg export --zip --output-dir=./sdk --x-install-root=./build/vcpkg_installed --x-manifest-root=vcpkg

# - name: 📤 Upload sdk
# if: github.event_name == 'workflow_dispatch' || github.event_name == 'release'
# uses: actions/upload-artifact@v4
# with:
# name: kadas-albireo2-sdk-${{ matrix.triplet }}
# path: |
# sdk/vcpkg-export-*.zip

# - name: 🌋 Build
# run: |
# cmake --build build
Loading