Commit Graph

3350 Commits (master)
 

Author SHA1 Message Date
Matthew Leeds 5246220826
Merge pull request #333 from smcv/brz
bzr: Run brz in preference to bzr
2020-03-20 16:48:50 -07:00
Simon McVittie 48761e778a bzr: Run brz in preference to bzr
Bazaar-NG (bzr) relies on Python 2, which has reached end-of-life, and
appears to be essentially unmaintained itself. Try using Breezy (brz),
a "friendly fork" of bzr that has been ported to Python 3 and is
maintained.

Signed-off-by: Simon McVittie <smcv@debian.org>
2020-03-20 20:19:26 +00:00
Alexander Larsson 66d2a68337 Update NEWS for release 2020-03-19 16:32:02 +01:00
Alexander Larsson 8f7bb9c7b8 Bump version to 1.0.10 2020-03-19 16:31:55 +01:00
Dan Nicholson aec06b3945 Support passing --token-type to build-export
Provide a --token-type command line option and a token-type manifest
property that allows passing the token type to build-export. The
manifest property takes precendence over the CLI option. In either case,
the value will be passed to build-export if it's >= 0. This requires
flatpak >= 1.6 to use the --token-type option in build-export.
2020-03-19 16:29:27 +01:00
Bastien Nocera 3fda50c199 source archive: Add 7zip support 2020-03-19 16:27:30 +01:00
Bastien Nocera 38b6c80a3b archive source: Allow overriding the archive type
This allows unpacking files that would otherwise not be recognised as of
a particular type, such as self-extracting files supported by zip, 7z or
cabextract.
2020-03-19 16:27:30 +01:00
Matthew Leeds 8c7bcf08a0
Merge pull request #322 from flatpak/tingping/checksum-quotes
Quote checksum in mismatch error for clarity
2019-11-14 10:41:40 -08:00
Patrick 99d1d511b6
Quote checksum in mismatch error for clarity
Closes #321
2019-11-14 04:19:34 -08:00
Matthew Leeds 14fb347e0b
Merge pull request #313 from flatpak/wip/hadess/fix-typos
doc: Fix typos
2019-10-15 10:43:44 -05:00
Bastien Nocera 35e8761268 doc: Fix typos 2019-10-15 13:16:38 +02:00
Alexander Larsson 6e9104ed47 Use github actions for CI 2019-10-02 14:42:36 +02:00
Matthew Leeds d996bb6884 doc/flatpak-builder: Improve explanation of --repo 2019-09-18 12:55:36 -07:00
Alexander Larsson 953cc86673 Update NEWS for 1.0.9 2019-09-13 15:49:59 +02:00
Alexander Larsson d98bf7c34f Bump version to 1.0.9 2019-09-13 15:49:48 +02:00
Alexander Larsson 8cd9401619 Support duplicate module names
If two modules happen to have the same name we uniquify them by
appending "-$n". While you shouldn't normally rely on this it is
sometimes hard to avoid when you're including some json snippet you
don't have control over.

Closes: #308
Approved by: alexlarsson
2019-09-13 13:25:32 +00:00
Alexander Larsson 3a3ca4d5a0 module: Add builder_module_set_name()
Closes: #308
Approved by: alexlarsson
2019-09-13 13:25:32 +00:00
Alexander Larsson aab7bcd5e9 Support --show-manifest
We want to use this in flathub to avoid all the problems we've having
parsing json manifests via the python parser, which isn't *quite* compatible
with json-glib (differs in comment and multiline string support for instance).

Closes: #307
Approved by: alexlarsson
2019-09-13 12:55:18 +00:00
Linus Jahn 28aaaaa55e source-git: Add option to disable submodules
Closes: #295
Approved by: alexlarsson
2019-09-13 10:51:18 +00:00
Olaf Leidinger 75c24ce291 Feature: Use CCACHE_DIR from environment, if set
Closes: #288
Approved by: alexlarsson
2019-09-13 10:40:24 +00:00
Ryan Gonzalez 788ffbb630 Minor fix for YAML number warning
This will properly make sure numbers are identified without giving a false positive for ".".

Closes: #298
Approved by: alexlarsson
2019-09-13 10:30:46 +00:00
Ryan Gonzalez b317081048 Support parsing sources files as yaml
Fixes #297.

Closes: #298
Approved by: alexlarsson
2019-09-13 10:30:46 +00:00
Matthew Leeds d5afdbccf8 doc/flatpak-builder: Clarify --run permissions
Looking at the implementation of builder_manifest_run(), it seems the
permissions used for flatpak-builder --run are the same as for the final
app, with the exception of filesystem permissions. So add that caveat to
the man page.

Closes: #303
Approved by: alexlarsson
2019-08-29 15:40:51 +00:00
Matthew Leeds 9baa2134e7 Use flatpak_spawnv() more
This means when flatpak-builder runs a flatpak command in a subprocess,
we can see the arguments passed to flatpak in the flatpak-builder
output, if -v was used.

Closes: #291
Approved by: alexlarsson
2019-06-28 08:55:11 +00:00
Alexander Larsson 199b31e064 Update NEWS for 1.0.8 2019-06-26 12:44:34 +02:00
Alexander Larsson d67ec7bd4a Bump version to 1.0.8 2019-06-26 12:44:09 +02:00
Matthew Leeds 6ac969f1f7 Update issue template 2019-06-11 12:45:57 -07:00
Seppo Yli-Olli cd1923a776 Make error handling more understandable
Closes: #284
Approved by: alexlarsson
2019-06-10 06:30:10 +00:00
Seppo Yli-Olli 30581bf63a Support multiple instances of install-deps-from
Closes: #284
Approved by: alexlarsson
2019-06-10 06:30:10 +00:00
Michael Gratton 068a598025 Ensure shallow repo mirror is updated when the git ref changes
Shallow clones only contain the ref that was cloned, and so if a
mirror is shallow and the ref is changed in a subsequent invocation of
builder, the new ref is absent and git fails with an error.

This patch avoids bailing out too soon when mirroring a repo if the
requested ref does not exist, to ensure it is fetched.

Fixes #285

Closes: #286
Approved by: alexlarsson
2019-05-14 10:56:23 +00:00
Alexander Larsson 982e86f840 Update NEWS for release 2019-05-10 09:28:40 +02:00
Alexander Larsson 3b5c3fd6c0 Bump version to 1.0.7 2019-05-10 09:28:33 +02:00
Christian Hergert d3399fd785 utils: force exit host commands when flatpak-builder exits
If we are spawning applications on the host using the Development service,
then we want those commands to exit when the flatpak-builder process
exits, as can happen from Ctrl^C or kill().

By using a static FlatpakHostCommandFlags we only ever check this a single
time and then each subsequent request will do the right thing.
2019-05-06 13:03:17 +02:00
Alexander Larsson d901d8202f CI: Add fuse-devel buildreq
Closes: #283
Approved by: alexlarsson
2019-05-06 09:07:56 +00:00
Alexander Larsson 15eb895e00 Update platform creation to ensure good mtimes and better cacheing
This splits the platform creation into 3 parts:
 * base - create the initial directory based on the parent platform
 * prepare - run prepare commands and apply all changes
 * cleanup - apply cleanups and cleanup commands

This has cacheing advantages in that prepare_commands and cleanup changes
only cause the minimal amount of rebuilds.

Additionally, it ensures that the mtimes are zeroed out (from the
previous checkout) both when the prepare and cleanup commands are run.
This is actually important, since these often generate caches (for
example fontconfig ones) which rely on zeroed mtimes so they match
what will be deployed.

Closes: #277
Approved by: alexlarsson
2019-04-04 08:48:18 +00:00
Alexander Larsson 6b4a09bf95 Bump version to 1.0.6 2019-03-27 11:33:59 +01:00
Alexander Larsson a29f67096f Update NEWS for release 2019-03-27 11:33:48 +01:00
Alexander Larsson acec80a8db install-deps: Pass --noninteractive for flatpak >= 1.2.0
Closes: #274
Approved by: alexlarsson
2019-03-05 07:13:34 +00:00
Alexander Larsson 2d938e2ccd Move flatpak_version_check to builder-utils.c
Closes: #274
Approved by: alexlarsson
2019-03-05 07:13:34 +00:00
Bastien Nocera 0e88f5430c docs: Fix default value for script source's "dest-filename"
The description for "dest-filename" was copy/pasted from the "file"
source's documentation for the same property. The default filename is
actually autogen.sh
2019-02-13 18:34:57 -05:00
Alexander Larsson 1f43471c70 Bump version to 1.0.5 2019-02-08 11:36:57 +01:00
Alexander Larsson b1ef699f9e Update for release 2019-02-08 11:36:47 +01:00
Alexander Larsson c7f8a50f7b Fix handling of sdk default compiler options
It turns out that newer flatpaks changed the output of flatpak info
and we relied on parsing that due to the lack of --show-location option
to flatpak info. However, that has been added since flatpak 0.11.8, so
just use that instead of parsing it.

Closes: #270
Approved by: alexlarsson
2019-02-08 10:21:47 +00:00
Alexander Larsson 8839ff08b1 Fixup error messages
We were printing argv[3] which is wrong (and typically null).
Instead set the error message where it happens and we know
what we were trying to do.

Closes: #269
Approved by: alexlarsson
2019-02-06 09:04:44 +00:00
Mathieu Bridon 416b7f599b Remove builder_git_checkout_dir
It is completely unused now that we checkout the whole tree in the
from-git code path.

Closes: #260
Approved by: alexlarsson
2019-02-05 14:58:27 +00:00
Mathieu Bridon 7d318128b6 from-git: Check out the whole tree instead of just the manifest
Some manifests now make use of the shared-modules Git repo from Flathub.
At least Totem does that, and we might see others do the same.

    https://gitlab.gnome.org/GNOME/totem/blob/master/flatpak/org.gnome.Totem.json
    http://sdkbuilder.gnome.org/logs/build-2019-01-18-141001/build-gnome-apps-nightly-master-org.gnome.Totem-x86_64.txt

That means we have to checkout the whole tree, otherwise we can't parse
the manifest.

Closes: #260
Approved by: alexlarsson
2019-02-05 14:58:27 +00:00
Mathieu Bridon dec058da72 from-git: Fetch the submodules as well
Some manifests now make use of the shared-modules Git repo from Flathub.
At least Totem does that, and we might see others do the same.

    https://gitlab.gnome.org/GNOME/totem/blob/master/flatpak/org.gnome.Totem.json
    http://sdkbuilder.gnome.org/logs/build-2019-01-18-141001/build-gnome-apps-nightly-master-org.gnome.Totem-x86_64.txt

That means we have to fetch the Git submodules before we can parse the
manifest.

Closes: #260
Approved by: alexlarsson
2019-02-05 14:58:27 +00:00
Alexander Larsson 9797f3ee0e Update NEWS for release 2019-02-05 14:11:01 +01:00
Alexander Larsson dd6eb157e5 Bump version to 1.0.4 2019-02-05 14:10:52 +01:00
Alexander Larsson ab72117fdd Add --add/remove-tag options
We'd like to use these in flathub.

Closes: #268
Approved by: alexlarsson
2019-02-04 10:02:33 +00:00