1. Forum
  2. Usenet
  3. LINUX.DEBIAN.DEVEL.MENTOR

  • mix upstream files from git tag and git branch to build orig.tar

    From Fab Stz@21:1/5 to All on Sat Nov 5 10:50:01 2022
    Hello,

    While packaging php-codeigniter-framework [1], I wanted to run the test suite specifically on PHP 8.2.

    Although I use the git repository as source of upstream as stated here in [2]
    I just noticed that the test suite is not shipped on the tag.

    However the test suite is available on the git branches.

    Any idea on how I could update the package from the git tags by still using d/ watch for the released tags and also get the "tests" directory from the branches of the git repository?

    It guess doing that way would mean that we build a version name with a +ds suffix like "3.1.13+ds.1-1".

    Or should I use the "components" feature of uscan and have a tarball named php-codeigniter-framework_3.1.13.orig-test.tar.xz? But how to exclude the unwanted directories then?

    Any other suggestion?

    BTW, the upstream tarball doesn't contain the test suite either.

    [1] https://salsa.debian.org/php-team/pear/php-codeigniter-framework
    [2] https://wiki.debian.org/Teams/DebianPHPGroup/Composer#Upstream_handling

    Rgds
    Fab

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Andrey Rahmatullin@21:1/5 to Fab Stz on Sat Nov 5 16:40:02 2022
    On Sat, Nov 05, 2022 at 10:27:47AM +0100, Fab Stz wrote:
    Hello,

    While packaging php-codeigniter-framework [1], I wanted to run the test suite
    specifically on PHP 8.2.

    Although I use the git repository as source of upstream as stated here in [2]
    I just noticed that the test suite is not shipped on the tag.

    However the test suite is available on the git branches.

    Any idea on how I could update the package from the git tags by still using d/
    watch for the released tags and also get the "tests" directory from the branches of the git repository?
    Make a patch that adds them, or ship them in debian/something and copy
    them to the necessary location (if needed) at the build time.

    It guess doing that way would mean that we build a version name with a +ds suffix like "3.1.13+ds.1-1".
    Yes if you create the tarball manually. I don't think existing tools can
    help you with this and so you won't be able to use uscan to recreate it.

    Or should I use the "components" feature of uscan and have a tarball named php-codeigniter-framework_3.1.13.orig-test.tar.xz? But how to exclude the unwanted directories then?
    I wouldn't recommend this.

    --
    WBR, wRAR

    -----BEGIN PGP SIGNATURE-----

    iQJhBAABCgBLFiEEolIP6gqGcKZh3YxVM2L3AxpJkuEFAmNmgjwtFIAAAAAAFQAP cGthLWFkZHJlc3NAZ251cGcub3Jnd3JhckBkZWJpYW4ub3JnAAoJEDNi9wMaSZLh uqYP/imfsokbg7KUHColtiZoI44IUU6znDZX+YEaptaP0i+DcyDnaZmX46AegElw Tqn54n0EZCr85Y78+QLA7lPfZnnL57BLYjSknWeKz2KeSgn3w/LlgOCfQjI9QTjz qvIP1PE7v2ttV/E1qi1rGngo5u1euEru07Zoubgxr6+8pfNpE7srMIhd2Lx7vcXn rfraO1JItOGJWZpbOumQ4rV+Q1WNX368crQ7SdHhDWRFxlSqavyuac2bK+nJZ85y PkEAi/ufbOwk0D/4/DSJ6MQBEYEILYYjnEsZl0o6HCUcPnqlGEZ5e3r1hjyIidyw AB37X5B4buUhFQuv4ZSnH43V7VNyzcMSJgh9Y1WkGTofLBtu2vRyVu0dv7C+F3ww Cw51jdAV04GJ1eclev25aY7Du+1lXxoKLj7LIAzfDxM/crSj1SUCPtLOxflu4+Wk /hSQ8Pt6VVvHDOVGBI9Q3eSFk92kaMvBX4iy8A41rY3sjvh9XbMjT4z1ZSeUUVmC TzY1uajzcaiZOG+mKo7B7KgvybXO9wS/aPL0bWV0CSrkaZHQ2EjEuXlD8e1RR0KU wItEo/D5kP3euPLzp0rn0cmK/2o6KWfcmNh5yVAYmkkXNDRg0nvoQGrZZc1DNnOU cyFomw9f3WgNIcO9KOq8HUaJv3ajh9Ij++RG+8U8JCfyekJp
    =knH/
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Fab Stz@21:1/5 to All on Tue Nov 8 10:10:01 2022
    Thanks.

    I added upstream's "tests" folder into "debian/tests/upstream"

    Rgds
    Fab

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)