This reverts commit ff69d3fb.

The changes are merged in now, so no need for a custom fork anymore.

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

This is a great example of why attempting to squeeze in changes before a
weekend is usually a terrible idea.

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

Now, repo updates take place as part of the regular publish process
(which has retries and resource groups set up), meaning that it's not
possible for the summary to go without updates if not all publishes
complete. This is an imperfect solution, but there isn't really a better
one available at the moment.

A few typos and YAML format issues were fixed as well.

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

It's entirely redundant at best, and at worst, it may be the cause of
the timeouts I've been observing.

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

It's not clear why this happens, but update-repo randomly hangs,
resulting in what should be a minute-long task timing out. As a
workaround, the job is given a much lower timeout but can retry a few
times, side-stepping the problem.

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

Who knew one regex could be so much trouble? This version is a bit
easier to read anyway...

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

It should only match names in the format of "/VERSION", but currently it
also matches "-VERSION".

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

Otherwise, the build-export invocations made by flatpak-builder end up
breaking:

https://phabricator.apertis.org/T8418



Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

GPLv3 isn't a problem in there, and various build tools will tend to
depend on functionality specific to the GNU versions.

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

This version passes --allow-remove-essential, which is needed to replace
essential packages with GNU versions in the SDK.

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

The former has been removed from the target repos.

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

Arnaud Ferraris authored 3 years ago and Ryan Gonzalez committed 3 years ago

curl was removed in favor of a graphical application, although it can be
useful, for example for demonstrating headless Flatpak apps, automated
testing or building a Flatpak purely from .deb packages.

This commit also adds the `--no-fakeroot` option to the flatdeb
invocation in `build-app-*` jobs, as `fakeroot` is otherwise used for
building the curl Flatpak, which fails when running under qemu.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

Arnaud Ferraris authored 3 years ago and Ryan Gonzalez committed 3 years ago

flatdeb is able to create Flatpak applications from existing Debian
packages instead of building them from source. This requires a few
additional build scripts to be present in the repo.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

Arnaud Ferraris authored 3 years ago and Ryan Gonzalez committed 3 years ago

When creating a Flatpak from a .deb package using flatdeb, we run
flatpak which needs a running D-Bus system bus. This commit makes sure
the D-Bus daemon is running before trying to build the app.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

Signed-off-by: Ritesh Raj Sarraf <rrs@debian.org>

Signed-off-by: Ritesh Raj Sarraf <rrs@debian.org>

Also refactors it into its own script & pushes all apps together in one
ostree-push command.

This is a holdover from before the SDK images had full coreutils, since
rust-coreutils's install doesn't support -D.

Arnaud Ferraris authored 3 years ago and Ryan Gonzalez committed 3 years ago

By pulling existing branches before building our runtimes and apps, we
can ensure new builds will be committed on top of existing branches,
therefore keeping a linear history.

This commit also adds a `.publish-app` template job, based on
`.publish-runtime`, for future use.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

Arnaud Ferraris authored 3 years ago and Ryan Gonzalez committed 3 years ago

Instead of hardcoding the runtime and app IDs, we can make use of CI
variables for defining the list of runtimes and apps to be built per-job.

The gnome-font-viewer recipe is updated by replacing '-' with '_' in its
ID so Flatpak doesn't complain about using invalid chars, and the file
is renamed accordingly.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

Running `flatpak build-update-repo` can take a long time on a big repo
as Flatpak goes through the history and all refs in order to generate a
new summary. Running this command only once (at the end of the pipeline)
would be more efficient.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

This makes upload location consistent with other CI pipelines

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

Arnaud Ferraris authored 3 years ago and Ryan Gonzalez committed 3 years ago

As we're deploying the ED25519 verification infrastructure, we should
now sign all commits as well as the repo summary.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

Arnaud Ferraris authored 3 years ago and Ryan Gonzalez committed 3 years ago

Not having an expiration delay for artifacts takes up valuable disk
space, which is not necessary. Making all artifacts expire after 24h
ensures we avoid that situation.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>

The latest flatdeb changes should make it significantly faster.

This isn't hardcoded to x86-64 now.