Bug#912902: [debian-mysql] Bug#912902: mariadb-10.1: FTBFS on !linux

2018-12-01 Thread Otto Kekäläinen
My last email was a false positive, I looked at the wrong patch. Your patch
was fine.

Release 1:10.1.37-2 was just uploaded and you should be able to verify that
all builds are OK within a few days.


Bug#912902: [debian-mysql] Bug#912902: mariadb-10.1: FTBFS on !linux

2018-12-01 Thread Samuel Thibault
Hello,

Otto Kekäläinen, le jeu. 29 nov. 2018 17:41:04 +0200, a ecrit:
> Can you please take a look ?

Sorry I didn't find the time to have a look, thanks for doing it!

Samuel



Bug#912902: [debian-mysql] Bug#912902: mariadb-10.1: FTBFS on !linux

2018-11-29 Thread Otto Kekäläinen
Hello Samuel!

While running "quilt push" I noticed the patch does apply cleanly:

Now at patch hurd.patch
Warning: trailing whitespace in lines 3,15 of cmake/os/GNU.cmake
Patch hurd.patch is unchanged
Applying patch fix-mips-compilation-failure-__bss_start-symbol-miss.patch
(Stripping trailing CRs from patch; use --binary to disable.)
patching file CMakeLists.txt
(Stripping trailing CRs from patch; use --binary to disable.)
patching file cmake/systemd.cmake
(Stripping trailing CRs from patch; use --binary to disable.)
patching file configure.cmake
Hunk #1 FAILED at 127.
1 out of 1 hunk FAILED -- rejects in file configure.cmake

Can you please take a look ?



Bug#912902: [debian-mysql] Bug#912902: mariadb-10.1: FTBFS on !linux

2018-11-06 Thread Samuel Thibault
Hello,

Otto Kekäläinen, le mar. 06 nov. 2018 10:01:17 +0200, a ecrit:
> ma 5. marrask. 2018 klo 1.26 Samuel Thibault (sthiba...@debian.org) kirjoitti:
> >
> > Otto Kekäläinen, le lun. 05 nov. 2018 00:46:18 +0200, a ecrit:
> > > Sorry, I just realized the gitlab-ci.yml for server was not merged on
> > > master yet. I will fix that within 24 hours (need to wait for some
> > > tests to pass first).
> >
> > Ok, I cherry-picked the commit so that the tests can run on my branches 
> > already.
> 
> Now it is on master:
> https://salsa.debian.org/mariadb-team/mariadb-10.1/commits/master
> 
> Please rebase on master before PR. Thanks!

I already rebased them, and the pipelines have passed.

Samuel



Bug#912902: [debian-mysql] Bug#912902: mariadb-10.1: FTBFS on !linux

2018-11-06 Thread Otto Kekäläinen
ma 5. marrask. 2018 klo 1.26 Samuel Thibault (sthiba...@debian.org) kirjoitti:
>
> Otto Kekäläinen, le lun. 05 nov. 2018 00:46:18 +0200, a ecrit:
> > Sorry, I just realized the gitlab-ci.yml for server was not merged on
> > master yet. I will fix that within 24 hours (need to wait for some
> > tests to pass first).
>
> Ok, I cherry-picked the commit so that the tests can run on my branches 
> already.

Now it is on master:
https://salsa.debian.org/mariadb-team/mariadb-10.1/commits/master

Please rebase on master before PR. Thanks!

If you while doing it have any more questions, don't hesitate to ask.
My intention is to ensure that our docs at
https://salsa.debian.org/mariadb-team/mariadb-10.1/blob/master/debian/README.Contributor
and https://wiki.debian.org/Teams/MySQL are as useful and up-to-date
as possible, so the barrier for future contributions would be as low
as possible.



Bug#912902: [debian-mysql] Bug#912902: mariadb-10.1: FTBFS on !linux

2018-11-04 Thread Samuel Thibault
Otto Kekäläinen, le lun. 05 nov. 2018 00:46:18 +0200, a ecrit:
> Sorry, I just realized the gitlab-ci.yml for server was not merged on
> master yet. I will fix that within 24 hours (need to wait for some
> tests to pass first).

Ok, I cherry-picked the commit so that the tests can run on my branches already.

Samuel



Bug#912902: [debian-mysql] Bug#912902: mariadb-10.1: FTBFS on !linux

2018-11-04 Thread Otto Kekäläinen
ma 5. marrask. 2018 klo 0.33 Samuel Thibault (sthiba...@debian.org) kirjoitti:
>
> Otto Kekäläinen, le dim. 04 nov. 2018 23:04:23 +0200, a ecrit:
> > I would appreciate it a lot if you can submit them as Merge Requests
> > on Salsa and have the debian/gitlab-ci.yml feature enabled on your
> > commits:
> > https://wiki.debian.org/Teams/MySQL/patches
>
> Well, I have pushed MRs, and enabled debian/.gitlab-ci.yml, but
> pipelines don't seem to be starting. There is no debian/.gitlab-ci.yml
> file in the master branch. How are we actually supposed to apply
> patches? By applying them on top of the master-citlab-ci-test branch to
> get the debian/.gitlab-ci.yml file? Also, I guess you prefer to have
> debian/changelog entries so avoid having to introduce them during the
> merge, but they'll keep conflicting as you add more entries until it
> gets merged.

Sorry, I just realized the gitlab-ci.yml for server was not merged on
master yet. I will fix that within 24 hours (need to wait for some
tests to pass first).

Please don't touch the debian/changelog file, it will be automatically
updated with git-dch eventually.

Thanks for the feedback, I updated the page accordingly:
https://wiki.debian.org/Teams/MySQL/patches



Bug#912902: [debian-mysql] Bug#912902: mariadb-10.1: FTBFS on !linux

2018-11-04 Thread Samuel Thibault
Otto Kekäläinen, le dim. 04 nov. 2018 23:04:23 +0200, a ecrit:
> I would appreciate it a lot if you can submit them as Merge Requests
> on Salsa and have the debian/gitlab-ci.yml feature enabled on your
> commits:
> https://wiki.debian.org/Teams/MySQL/patches

Well, I have pushed MRs, and enabled debian/.gitlab-ci.yml, but
pipelines don't seem to be starting. There is no debian/.gitlab-ci.yml
file in the master branch. How are we actually supposed to apply
patches? By applying them on top of the master-citlab-ci-test branch to
get the debian/.gitlab-ci.yml file? Also, I guess you prefer to have
debian/changelog entries so avoid having to introduce them during the
merge, but they'll keep conflicting as you add more entries until it
gets merged.

Samuel



Bug#912902: [debian-mysql] Bug#912902: mariadb-10.1: FTBFS on !linux

2018-11-04 Thread Otto Kekäläinen
Hello!

Thanks for the patches!

I would appreciate it a lot if you can submit them as Merge Requests
on Salsa and have the debian/gitlab-ci.yml feature enabled on your
commits:
https://wiki.debian.org/Teams/MySQL/patches