Skip to content
Permalink
Browse files
Merge branch 'master' into metasearch-ogcapi-records
  • Loading branch information
tomkralidis committed Oct 9, 2021
2 parents 5f25e47 + 8498c55 commit 20e3a732b5b5175d1e0ff3a62b98bb50b0f0dbbd
Showing 1,220 changed files with 46,554 additions and 11,471 deletions.
@@ -22,3 +22,7 @@ test_core_layerdefinition

# MSSQL requires the MSSQL docker
PyQgsProviderConnectionMssql

# Too fragile at the moment
test_core_networkaccessmanager

@@ -11,14 +11,21 @@ services:
httpbin:
image: kennethreitz/httpbin:latest

webdav:
image: nginx
volumes:
- ${GH_WORKSPACE}/.docker/webdav/nginx.conf:/etc/nginx/conf.d/default.conf
- ${GH_WORKSPACE}/.docker/webdav/passwords.list:/etc/nginx/.passwords.list
- /tmp/webdav_tests:/tmp/webdav_tests_root/webdav_tests

qgis-deps:
tty: true
image: qgis3-build-deps-binary-image
volumes:
- ${GH_WORKSPACE}:/root/QGIS
# links:
# - mssql
links:
# - mssql
- webdav
- httpbin
env_file:
- docker-variables.env
@@ -175,7 +175,28 @@ EOT

fi

#######################################
# Wait for WebDAV container to be ready
#######################################

if [ $# -eq 0 ] || [ $1 = "ALL_BUT_PROVIDERS" ] || [ $1 = "ALL" ] ; then

echo "Wait for webdav to be ready..."
COUNT=0
while ! curl -f -X GET -u qgis:myPasswd! http://$QGIS_WEBDAV_HOST:$QGIS_WEBDAV_PORT/webdav_tests/ &> /dev/null;
do
printf "."
sleep 5
if [[ $(( COUNT++ )) -eq 40 ]]; then
break
fi
done
if [[ ${COUNT} -eq 41 ]]; then
echo "Error: WebDAV docker timeout!!!"
else
echo "done"
fi
fi

###########
# Run tests
@@ -20,3 +20,6 @@ QGIS_CONTINUOUS_INTEGRATION_RUN=true
PUSH_TO_CDASH=false

XDG_RUNTIME_DIR=/tmp

QGIS_WEBDAV_HOST=webdav
QGIS_WEBDAV_PORT=80
@@ -0,0 +1,21 @@
server {
listen 80;
listen [::]:80;
server_name localhost;

location /webdav_tests {

auth_basic realm_name;
auth_basic_user_file /etc/nginx/.passwords.list;

dav_methods PUT DELETE MKCOL COPY MOVE;
#dav_ext_methods PROPFIND OPTIONS;
dav_access user:rw group:rw all:r;

autoindex on;

client_max_body_size 0;
create_full_put_path on;
root /tmp/webdav_tests_root;
}
}
@@ -0,0 +1 @@
qgis:$apr1$cxID/nB1$3tG4J0FkYvEHyWAB.yqjo.
@@ -1,4 +1,4 @@
name: Bug/Crash report
name: Bug/Crash report but not related to a third party plugin, read below for plugins
description: Create a bug report to help us improve QGIS.
labels:
- 'Bug'
@@ -8,6 +8,11 @@ body:
value: |
Thanks for taking the time to fill out this bug report correctly.
Please report only issues related to the QGIS application.
If the issue is related to a plugin, you should file the issue in the plugin code repository.
You can find the URL in the QGIS Plugin Manager.
- type: textarea
id: what
attributes:
@@ -38,6 +43,28 @@ body:
validations:
required: true

- type: checkboxes
id: qgis-version
attributes:
label: Supported QGIS version
description: |
Each month, there is a new release of QGIS. According to the release schedule, you should at least be running a supported QGIS version.
You can check the release schedule https://www.qgis.org/en/site/getinvolved/development/roadmap.html#release-schedule
options:
- label: I'm running a supported QGIS version according to the roadmap.

- type: checkboxes
id: new-profile
attributes:
label: New profile
description: |
Did you try with a new QGIS profile? Some issues or crashes might be related to plugins or user configuration.
You must try with a new profile to check if the issue remains.
Read this link how to create a new profile
https://docs.qgis.org/3.16/en/docs/user_manual/introduction/qgis_configuration.html#working-with-user-profiles
options:
- label: I tried with a new QGIS profile

- type: textarea
id: additional-context
attributes:
@@ -13,6 +13,8 @@ contact_links:
GitHub issues are for bug reports and suggestions for new features.
- name: QGIS plugin issue
# There must be a link to make this option valid for GitHub
url: https://plugins.qgis.org
about: >
If the issue concerns a third party plugin (downloaded with the plugin manager) then it can't be fixed
by the QGIS core team. Please raise your issue in the dedicated bug tracker for that specific plugin
@@ -21,7 +21,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- name: Run flake8
uses: julianwachholz/flake8-action@v2.0.0
uses: julianwachholz/flake8-action@v2.0.2
with:
checkName: 'Python Lint'
env:
@@ -14,7 +14,8 @@ on:

env:
QT_VERSION: 5.15.2
QGIS_DEPS_VERSION: 0.8.0
QGIS_DEPS_VERSION: 0.9
QGIS_DEPS_PATCH_VERSION: 0
CCACHE_DIR: /Users/runner/work/ccache
BUILD_DIR: /Users/runner/work/QGIS/build-QGIS
# apparently we cannot cache /opt directory as it fails to restore
@@ -82,20 +83,20 @@ jobs:
id: cache-deps
uses: pat-s/always-upload-cache@v2.1.5
with:
path: ${{ env.DEPS_CACHE_DIR }}/QGIS/qgis-deps-${{ env.QGIS_DEPS_VERSION }}
key: mac-qgis-deps-v4-${{ env.QGIS_DEPS_VERSION }}
path: ${{ env.DEPS_CACHE_DIR }}/QGIS/qgis-deps-${{ env.QGIS_DEPS_VERSION }}.${{ env.QGIS_DEPS_PATCH_VERSION }}
key: mac-qgis-deps-v4-${{ env.QGIS_DEPS_VERSION }}.${{ env.QGIS_DEPS_PATCH_VERSION }}

- name: Restore qgis-deps
if: steps.cache-deps.outputs.cache-hit == 'true'
run: |
sudo mkdir -p /opt
sudo mkdir -p /opt/QGIS
sudo cp -r ${DEPS_CACHE_DIR}/QGIS/qgis-deps-${QGIS_DEPS_VERSION} /opt/QGIS/qgis-deps-${QGIS_DEPS_VERSION}
sudo cp -r ${DEPS_CACHE_DIR}/QGIS/qgis-deps-${QGIS_DEPS_VERSION}.${QGIS_DEPS_PATCH_VERSION} /opt/QGIS/qgis-deps-${QGIS_DEPS_VERSION}
- name: Download qgis-deps
if: steps.cache-deps.outputs.cache-hit != 'true'
run: |
wget https://qgis.org/downloads/macos/deps/qgis-deps-${QGIS_DEPS_VERSION}.tar.gz
wget https://qgis.org/downloads/macos/deps/qgis-deps-${QGIS_DEPS_VERSION}.${QGIS_DEPS_PATCH_VERSION}.tar.gz
mkdir -p ${DEPS_CACHE_DIR}
mkdir -p ${DEPS_CACHE_DIR}/QGIS
@@ -106,13 +107,13 @@ jobs:
QT_ALREADY_CACHED: ${{ steps.cache-qt.outputs.cache-hit }}
QGIS_DEPS_ALREADY_CACHED: ${{ steps.cache-deps.outputs.cache-hit }}
run: |
wget https://qgis.org/downloads/macos/deps/install_qgis_deps-${QGIS_DEPS_VERSION}.bash
chmod +x ./install_qgis_deps-${QGIS_DEPS_VERSION}.bash
wget https://qgis.org/downloads/macos/deps/install_qgis_deps-${QGIS_DEPS_VERSION}.${QGIS_DEPS_PATCH_VERSION}.bash
chmod +x ./install_qgis_deps-${QGIS_DEPS_VERSION}.${QGIS_DEPS_PATCH_VERSION}.bash
echo ::group::Install deps
sudo ./install_qgis_deps-${QGIS_DEPS_VERSION}.bash
sudo ./install_qgis_deps-${QGIS_DEPS_VERSION}.${QGIS_DEPS_PATCH_VERSION}.bash
echo ::endgroup::
[[ ${QT_ALREADY_CACHED} != "true" ]] && cp -r /opt/Qt/${QT_VERSION} ${DEPS_CACHE_DIR}/Qt/${QT_VERSION} || true
[[ ${QGIS_DEPS_ALREADY_CACHED} != "true" ]] && cp -r /opt/QGIS/qgis-deps-${QGIS_DEPS_VERSION} ${DEPS_CACHE_DIR}/QGIS/qgis-deps-${QGIS_DEPS_VERSION} || true
[[ ${QGIS_DEPS_ALREADY_CACHED} != "true" ]] && cp -r /opt/QGIS/qgis-deps-${QGIS_DEPS_VERSION} ${DEPS_CACHE_DIR}/QGIS/qgis-deps-${QGIS_DEPS_VERSION}.${QGIS_DEPS_PATCH_VERSION} || true
- name: Install ccache
run: |
@@ -19,32 +19,34 @@ on:

jobs:
mingw64-build:
env:
CCACHE_DIR: ${{ github.workspace }}/.ccache
name: MinGW64 Windows Build
runs-on: ubuntu-latest
container:
image: fedora:rawhide
options: --security-opt seccomp=unconfined
volumes:
- ${{ github.workspace }}:/w
steps:

- uses: actions/checkout@v2

- name: Build Docker Container with Build Environment
id: docker-build
uses: whoan/docker-build-with-cache-action@v5
with:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: docker.pkg.github.com
image_name: qgis3-mingw-buildenv
dockerfile: ms-windows/mingw/qgis3-build-deps-mingw.dockerfile
push_git_tag: true
push_image_and_stages: on:push
pull_image_and_stages: ${{ github.event_name != 'workflow_dispatch' }}
- name: Update system
run: dnf -y update

- name: Install core dependencies
run: dnf -y install zip

- name: Install build dependencies
run: ./ms-windows/mingw/mingwdeps.sh

- name: Create ccache dir
run: mkdir -p /w/.ccache/QGIS

- name: Prepare build cache for pull request
uses: pat-s/always-upload-cache@v2.1.5
if: github.event_name == 'pull_request'
with:
path: ${{ github.workspace }}/.ccache
path: /w/.ccache/QGIS
key: mingw64-ccache-${{ github.actor }}-${{ github.head_ref }}-${{ github.sha }}
# The head_ref or source branch of the pull request in a workflow run.
# The base_ref or target branch of the pull request in a workflow run.
@@ -58,7 +60,7 @@ jobs:
uses: pat-s/always-upload-cache@v2.1.5
if: github.event_name != 'pull_request'
with:
path: ${{ github.workspace }}/.ccache
path: /w/.ccache/QGIS
# The branch or tag ref that triggered the workflow run. For branches this in the format refs/heads/<branch_name>, and for tags it is refs/tags/<tag_name>
key: mingw64-ccache-${{ github.ref }}-${{ github.sha }}
restore-keys: |
@@ -67,15 +69,7 @@ jobs:
- name: Build QGIS Application
run: |
mkdir -p ${GITHUB_WORKSPACE}/.ccache
docker run \
--env CCACHE_DIR=/QGIS/.ccache \
-w /QGIS \
-v ${GITHUB_WORKSPACE}:/QGIS \
${DOCKER_IMAGE} \
ms-windows/mingw/build.sh x86_64 nodebug 4
env:
DOCKER_IMAGE: ${{ steps.docker-build.outputs.FULL_IMAGE_NAME }}
CCACHE_DIR=/w/.ccache/QGIS ./ms-windows/mingw/build.sh x86_64 nodebug 4
- name: Create Portable zip
run: |
@@ -386,4 +386,5 @@ jobs:
[[ ${{ matrix.test-batch }} == "ORACLE" ]] && sudo rm -rf /usr/share/dotnet/sdk
echo "TEST_BATCH=$TEST_BATCH"
echo "DOCKERFILE=$DOCKERFILE"
mkdir -p /tmp/webdav_tests && chmod 777 /tmp/webdav_tests
docker-compose -f .docker/$DOCKERFILE run qgis-deps /root/QGIS/.docker/docker-qgis-test.sh $TEST_BATCH
Empty file.
@@ -929,12 +929,12 @@ if (WITH_CORE AND WITH_BINDINGS AND NOT WITH_QT6)
set (QGIS_PYTHON_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/qgis)

# python support: check for interpreter, sip, pyqt5
find_package(SIP REQUIRED)
find_package(PyQt5 REQUIRED)
set(PYQT_SIP_FLAGS ${PYQT5_SIP_FLAGS})
set(PYQT_SIP_DIR ${PYQT5_SIP_DIR})
separate_arguments(PYQT_SIP_FLAGS) # convert space separated values to a list

find_package(SIP REQUIRED)
find_package(Qsci REQUIRED)
include(PythonMacros)
include(PyQtMacros)

0 comments on commit 20e3a73

Please sign in to comment.