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

Recover pointcloud tests #34500

Merged
merged 5 commits into from
Feb 18, 2020
Merged

Recover pointcloud tests #34500

merged 5 commits into from
Feb 18, 2020

Conversation

strk
Copy link
Contributor

@strk strk commented Feb 17, 2020

Removed with #34495 for unstable
results, improved here to build a well-known version of pointcloud.

This reverts commit bf69156 while
improving predictability of results
@strk
Copy link
Contributor Author

strk commented Feb 17, 2020

Failure we want to address:
https://travis-ci.org/qgis/QGIS/jobs/650370964#L837

@strk
Copy link
Contributor Author

strk commented Feb 17, 2020

Error is:

configure: error: the PGXS Makefile /usr/lib/postgresql/12/lib/pgxs/src/makefiles/pgxs.mk cannot be found. Please install the PostgreSQL server development packages and re-run configure.

We're installing postgresql-server-dev-11 as part of the Dockerfile instructions, so I dunno why 12 is being found, I guess he kartoza Docker is also having 12 installed, so pg_config points there, and we just need to tweak the PATH variable to make sure to use 11 instead.

@@ -5,3 +5,16 @@ ADD auth_system/certs_keys/postgres.key /etc/ssl/private/postgres_key.key
ADD auth_system/certs_keys/issuer_ca_cert.pem /etc/ssl/certs/issuer_ca_cert.pem

RUN chmod 400 /etc/ssl/private/postgres_key.key

# Compile and install PointCloud.
# NOTE: release 1.2.0 would not build against PostgreSQL-11:
Copy link
Member

Choose a reason for hiding this comment

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

The last 1.2.1 release should compile fine though.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Trying 1.2.1 next...

@strk
Copy link
Contributor Author

strk commented Feb 18, 2020

Packaging issue, looks like: PostgreSQL 11 server dev package not including pg_config !
Any reason why our test uses 11 instead of 10 or 12 ?

(works around a packaging bug in postgresql-server-dev-11)
@strk
Copy link
Contributor Author

strk commented Feb 18, 2020

@pblottiere if you find the time to fix pgpointcloud/pointcloud#256 we'd be able to install pointcloud from a package instead of building it ...

@pblottiere
Copy link
Member

@pblottiere if you find the time to fix pgpointcloud/pointcloud#256 we'd be able to install pointcloud from a package instead of building it ...

Yes, it's on my todo list. I'll probably have time to investigate by the end of this month.

@strk strk self-assigned this Feb 18, 2020
@strk strk requested a review from pblottiere February 18, 2020 13:39
@strk strk merged commit ced0ed4 into qgis:master Feb 18, 2020
@qgis-bot
Copy link
Collaborator

The backport to release-3_10 failed:

The process 'git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-3_10 release-3_10
# Navigate to the new working tree
cd .worktrees/backport-release-3_10
# Create a new branch
git switch --create backport-34500-to-release-3_10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ced0ed4c79e2d24227b74a768a5101da5c81d6a5
# Push it to GitHub
git push --set-upstream origin backport-34500-to-release-3_10
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_10

Then, create a pull request where the base branch is release-3_10 and the compare/head branch is backport-34500-to-release-3_10.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants