Change-Id: I34fc48ac880a6673579f88b700b0baa5bd8cd585

* Makefile (QT_PATCH): Bump up to 2.
(QT_TARBALL_CHECKSUM): Update to Qt 6.2.2 release tarball's sha256sum.
* docker/Dockerfile_ubuntu_18.04: Move the nodejs installation earlier
in the Dockerfile, as it needs to already be installed by the time we
want to install libqt-jami's build dependencies.
* packaging/rules/debian-qt/control (libqt-jami) <Build-Depends>: Add
missing nodejs (>= 10.19) dependency.

jami-packaging#111
Change-Id: Ie15a1f4c7cfb274dc6a1784ce41f5b7383002abe

Sébastien Blin authored 3 years ago and Amin Bandali committed 3 years ago

* docker/Dockerfile_opensuse-leap_15.3: The 'opensuse/leap:15.3'
docker image doesn't seem to have gcc11, so use gcc10 instead.
* packaging/rules/rpm/jami-gnome.spec: Unconditionally require
'make' for build, and require 'cmake' only where a recent enough
version is available in the distro (otherwise, we grab and use
external cmake e.g. using 'scripts/install-cmake.sh').

jami-packaging#111


Co-authored-by: Amin Bandali <amin.bandali@savoirfairelinux.com>
Change-Id: I5686f8e5d77eb8108b1581a33a2432006a1a688b

Change-Id: Iacf9fd55b6a8cfc3521df1c10cb99192de8ae536

tumbleweed is broken since months (zypper crashes on the docker image)
and no issue remounted, also we support guix and snap for this platforms.

Change-Id: I0de908ba91eeeaf42c0d2599b3d69924fbcb7920

https: //git.jami.net/savoirfairelinux/jami-packaging/-/issues/111
Change-Id: I481e71d9650ce738c3211448aadd1d93478d84dc

Change-Id: I54ef1d4adc7823fe3a38cd9ff7e7ee9af6a774bb

Maxim Cournoyer authored 3 years ago and Sébastien Blin committed 3 years ago

This should prevent errors like:

E: Repository 'http://deb.debian.org/debian testing InRelease' changed
its 'Codename' value from 'bullseye' to 'bookworm'

Change-Id: If3834c2a81bc084d79b706eb8714b04189698a90

Change-Id: I195452f1b14a835d08b4e1be734b7a9bd880ef8a

CMake 3.10 in Ubuntu 18.04 has a bug where it finds Python 2 even when
Python 3 is present.  Install 3.12, where the bug is fixed.

* docker/Dockerfile_ubuntu_18.04: Download, check and extract CMake
3.12 to /usr/local.

Change-Id: I8e344e630cfcdc58d8e3579ac0b7c22314264ab9

As it is not necessary.

Change-Id: Ic58236dc0da3c24a090c9f05437482b46892f6c5

This give us more controls about bugs and anyway, we're going to
use Qt 6.2 for macOS support.

Change-Id: I78c17a9984248b4dad08ab2091532159335d4c97

Maxim Cournoyer authored 3 years ago and Amin Bandali committed 3 years ago

Prior to this change, the Makefile packaging targets were generated by
a Python script, supposedly to reduce boilerplate.  Make is able to
programmatically define rules, so use its features instead.

The packaging targets 'package-' prefix is dropped, making the targets
names match the distribution directly, such as 'ubuntu_20.04'.

The docker *-ro bind mounts are dropped; instead only the release
tarball file name is exposed to the containers as *the* source, which
makes it unambiguous as to which sources are used.

The files related to RHEL builds are removed, as the RHEL build is
known to be broken and isn't being used.

* Makefile (DISTRIBUTIONS): New variable.
(make-docker-package-target): New function.
(docker/Dockerfile-snap): Adjust accordingly.
docker/*: Standardize to use hyphens instead of a mix of hyphens and
underscores.
* docker/Dockerfile_rhel_8: Delete file.
* docker/profile-seccomp-fedora_28.json: Delete file.
* scripts/make-packaging-target.py: Delete file.
* Jenkinsfile: Adjust accordingly.

Change-Id: I2dc42b489a54b177ad038398a9d23a2a7e3007ec

Change-Id: I10a69b2026f6e6aa963ffaa95702c0c58c39d216

Change-Id: I8e6f99f0322d8787c8991228bdd6681b950b6a19

Change-Id: I9a18124056477b3552ebd0c4cb16117d1600497c

Use the recommended exec syntax for the CMD directive in the
Dockerfiles, which invokes the command directly rather than through an
intermediate shell.  Also provide the -i option, but conditionally as
Docker checks if there is a real TTY to connect to, which is not the
case in Jenkins.

* scripts/make-packaging-target.py (PACKAGE_*_DOCKER_RUN_COMMAND)
[IS_SHELL_INTERACTIVE]: Conditionally provide the '-i' option.
(package-*-interactive) <DOCKER_EXTRA_ARGS>: Remove target-specific variable.
(DOCKER_EXTRA_ARGS): Move/rename variable to ...
* Makefile (DOCKER_RUN_EXTRA_ARGS): ... here/this.
(IS_SHELL_INTERACTIVE): New variable.

The rest of this change was automated using the command:

  $ git grep -l CMD | xargs sed -i -E 's,CMD (.*)$,CMD ["\1"],g'

Change-Id: I93ba9ad8115541a7c7f02421384ae01a5b0650ad

This avoids invalidating the cache when changing the rules file of the
packages, for example.

Automated via:

  $ git ls-files | grep Dockerfile | xargs sed -i 's,packaging/rules/debian-qt/\* /tmp/builddeps/debian/,packaging/rules/debian-qt/control /tmp/builddeps/debian/control,g'
  $ $ git ls-files | grep Dockerfile | xargs sed -i 's,packaging/rules/debian/\* /tmp/builddeps/debian/,packaging/rules/debian/control /tmp/builddeps/debian/control,g'

Change-Id: Ic33d7af4c022ed9de53df245c861a31d2786fc96

Change-Id: I5cbc06d5f7b245bf49578914819a8154c9d2cd6e

Amin Bandali authored 3 years ago and Sébastien Blin committed 3 years ago

Since the introduction of libqt-jami deb packages, they were built
using quite an ugly hack on the Jenkins side.  This patch reworks all
of that so that libqt-jami is built for each distro version if it was
not already previously built, or if a force rebuild is specified.

Change-Id: Ib74b747628a007cd0d61b068e0ff9ed80006b93d

Change-Id: Icff500f88094c5a904095c228f68824514c157ce

Maxim Cournoyer authored 3 years ago and Maxim Cournoyer committed 3 years ago

This resolves the following error:

  ImportError: /usr/lib64/libgobject-2.0.so.0: undefined symbol:
  g_memdup2

* docker/Dockerfile_opensuse-tumbleweed: Do not update and install
stuff in various steps.
* docker/Dockerfile_opensuse-leap_15.2: Likewise.

Change-Id: I286576cddd5226cf40fd1bec997be36b2142e355

This further reduces the targets set to what the CI currently uses.
The native ARM (armhf, aarch64) builds are dropped as we are not
equipped in terms of native hardware to build them and QEMU user
emulation is too slow.  The remaining i386 builds are removed as they
are not used by the CI and have or are being phased out by their
upstreams.

* scripts/make-packaging-target.py
(DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS): New variable.
[debian_10]: Use it.
[debian_10_i386, debian_10_armhf, debian_10_arm64]
[ubuntu_18.04_i386, ubuntu_18.04_qt_i386]: Delete targets.
[rhel_8]: Comment out target for now.
[debian_testing]: Use the above variable.
[ubuntu_20.04, ubuntu_20.10, ubuntu_21.04]: Likewise.
* docker/Dockerfile_debian_10_arm64: Delete file.
* docker/Dockerfile_debian_10_armhf: Likewise.
* docker/Dockerfile_debian_10_i386: Likewise.
* docker/Dockerfile_ubuntu_18.04_i386: Likewise.
* docker/Dockerfile_ubuntu_18.04_qt_i386: Likewise.

Change-Id: Iabb840e7f9a2111afe822e2c05797a651d55e21d

Amin Bandali authored 3 years ago and Sébastien Blin committed 3 years ago

Change-Id: I33f13231006e568a8de9b0e067db4aaf6f15739c

Change-Id: If3512d8c56cb19622f72c6245f6c04c411b719e2

Change-Id: I07cf920ed99f460bffe1d8a16f3444706f4572c3

Change-Id: Iaf5f84533e2eb6d7efc9f52b1aab3846152d9ae8

This is a follow-up to commit
47b1b0151d6c3703ee25c0050cd2031ab7edae4c, which removed it from the
make-packaging-target.py script.

* docker/Dockerfile_debian_10: Remove support code for
OVERRIDE_PACKAGING_DIR.
* docker/Dockerfile_debian_10_arm64: Likewise.
* docker/Dockerfile_debian_10_armhf: Likewise.
* docker/Dockerfile_debian_10_i386: Likewise.
* docker/Dockerfile_debian_10_qt: Likewise.
* docker/Dockerfile_ubuntu_18.04: Likewise.
* docker/Dockerfile_ubuntu_18.04_i386: Likewise.
* docker/Dockerfile_ubuntu_18.04_qt: Likewise.
* docker/Dockerfile_ubuntu_18.04_qt_i386: Likewise.
* docker/Dockerfile_ubuntu_20.04: Likewise.
* docker/Dockerfile_ubuntu_20.04_qt: Likewise.
* docker/Dockerfile_ubuntu_20.10: Likewise.
* docker/Dockerfile_ubuntu_20.10_qt: Likewise.
* scripts/build-package-debian-qt.sh: Likewise.
* scripts/build-package-debian.sh: Likewise.

Change-Id: Ia15961fe1ccc05222d43da2bdded819f95315aae

Amin Bandali authored 4 years ago and Maxim Cournoyer committed 3 years ago

Also remove unused DEBIAN_PACKAGING_OVERRIDE.

Change-Id: Ida109a811bebd1fb46fd1a8b90fb5463518382c0

Amin Bandali authored 4 years ago and Maxim Cournoyer committed 3 years ago

Change-Id: I983607f226476c32a6862a41b55ca1b13a2c010b

Sébastien Blin authored 3 years ago and Maxim Cournoyer committed 3 years ago

Change-Id: Ied0febeca35f3d39724401669427bdfecc8f093c

Sébastien Blin authored 3 years ago and Maxim Cournoyer committed 3 years ago

Change-Id: Ib3e5a459f907928882bd9be4427fafe75f053080

Sébastien Blin authored 3 years ago and Maxim Cournoyer committed 3 years ago

also de-duplicate code

Change-Id: I3ea9fedec5b4520e74489f3f4e03a533130d9e83

A new spec file is added, and the Fedora Docker images are augmented
with the required Qt dependencies.  The client-qt submodule is now
also included in the release tarball.

GitLab: #264
Change-Id: I2f25fdc3270a7fed13b9b0714d01feb37f270077

Change-Id: Id24a6a8b2db26842a16e9ad4bbdbb0c30447bb96

Change-Id: I0636da7d2b26eb75a6f8f3a37a2c92f1fd05fdfd

This hack is no longer necessary.  The Jenkins nodes are running Docker 19.

Change-Id: I8e41e1295a49ebe48b2fca9fa6c91158f49f16c9

Debian 9 packaging is removed as well, not because it is EOL, but
because it doesn't have the runtime required to run Jami (the daemon
requires C++17 but GCC 6 in Debian stretch doesn't support it).

A 'list-package-targets' Make target is also added; it'll be used by
the CI.

Change-Id: I87a26b14ea48bd17ebccb536f23a5f2637f28743

Maxim Cournoyer authored 4 years ago and Sébastien Blin committed 4 years ago

The current target is not functional; the Gentoo packaging is
community maintained anyway.

Change-Id: I7dfe8641ccddb53ff1a448f2afaacaa591fc7dec

Change-Id: I5b24b809cec3763c44808fe9f056cba862336531