Commit Graph

18 Commits

Author SHA1 Message Date
Michael Biebl
1fb1176384 d/e/checkout-upstream: switch to main branch
See https://github.com/systemd/systemd/issues/16834
2021-05-07 12:23:58 +02:00
Balint Reczey
511d5d5452 debian/extra/checkout-upstream: Use dots when deriving version from upstream
to sort higher than potential versions in Debian and also to conform native
package versioning practice.
2019-09-10 12:47:42 +02:00
Balint Reczey
6bbc230b0b d/e/checkout-upstream: Keep all autopkgtests when KEEP_DEBIAN_TESTS is set 2019-09-10 12:47:42 +02:00
Balint Reczey
f7ac1e2c61 d/e/checkout-upstream: Add KEEP_DEBIAN_PATCHES option to keep patches
The Debian patches that apply cleanly are kept when KEEP_DEBIAN_PATCHES
is set to give a better picture of how the tested upstream version
would work packaged.
2019-09-10 12:47:42 +02:00
Balint Reczey
2487c0ebc2 debian/extra/checkout-upstream: rebase only PRs on upstream master
This fixes testing arbitrary upstream commits with UPSTREAM_HEAD=<commit-id>.
2019-09-10 12:47:42 +02:00
Balint Reczey
551f1cc82a d/e/checkout-upstream: UPSTREAM_REPO can override default systemd repo 2019-09-10 12:47:42 +02:00
Dan Streetman
5da4807394 d/e/checkout-upstream: set user.name, user.email if unset
later calls to git commit want these; sometimes git fails without them
2019-07-24 07:25:58 -04:00
Dan Streetman
77c1d70d5a d/e/checkout-upstream: switch from 'quilt' to 'native' format
We're removing all patches and using upstream code; there is no
need to remain quilt format.
2019-07-24 07:14:28 -04:00
Dan Streetman
58d873bc4f d/e/checkout-upstream: create git commits for each change
Create a commit with any debian/ changes, commit with all upstream code
changes, and a final commit with the updated changelog entry.

For normal operation, where this script is being called from upstream
autopkgtest tests, there is no need for creating git commits with the
changes made by this script; however, creating the commits won't (shouldn't)
break anything in the normal upstream test process.

Where creating git commits with this script's changes is useful is for a
local git repository used for development - specifically, to maintain
a git repo that includes the upstream systemd source code, but also the
debian/ code (including tests) so that the package can be built in a ppa
and tested using autopkgtest, without needing to use github to perform the
testing.
2019-07-24 07:10:17 -04:00
Dan Streetman
fa1d28714b d/e/checkout-upstream: add UPSTREAM_KEEP_CHANGELOG param
It can be useful to skip creating the new changelog entry, if
the caller only wants to pull the latest upstream code into a
git repo; this adds a env var that allows doing that.

By default, without the var set, the changelog entry is created,
so existing behavior is unchanged.
2019-07-18 18:29:18 -04:00
Dan Streetman
ef56e584d5 d/e/checkout-upstream: move change to debian/ files above other changes
This is in preparation for creating git commits for the changes.
2019-07-18 17:49:34 -04:00
Dan Streetman
1f1e47cfd2 d/e/checkout-upstream: don't remove .git
It is *super* annoying when running this in a git repo, as it
completely wipes out the local git repo.  This commit leaves the
.git directory in place.
2019-07-18 17:26:23 -04:00
Martin Pitt
fe89a87ef7 debian/extra/checkout-upstream: Support submodules
See https://github.com/systemd/systemd/pull/12151
2019-05-17 20:35:04 +02:00
Martin Pitt
b744f71282 debian/extra/checkout-upstream: Rebase PR against master
With this, what we test will be much closer to what we will actually
merge. It also avoids older PRs to now suddenly fail because they are
based against an older HEAD without the meson patches.
2017-04-26 08:56:21 +02:00
Martin Pitt
dc5da62e93 debian/extra/checkout-upstream: Try again after one minute if git checkout fails
This should avoid failures from transient network errors, like in

  https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-xenial-pitti-systemd-semaphore/xenial/amd64/s/systemd-upstream/20160218_135146@/log.gz
2016-02-18 15:39:07 +01:00
Martin Pitt
c7d36e4e6d Revert "checkout-upstream: shallow cloning"
This reverts commit 8d6e1b9981.
That broke "git describe".
2016-02-10 18:20:41 +01:00
Martin Pitt
8d6e1b9981 checkout-upstream: shallow cloning
We don't need the entire history, so clone/fetch with --depth=1.
2016-02-10 17:27:58 +01:00
Martin Pitt
dbb315b949 Add debian/extra/checkout-upstream
This is a script to replace the current source with a checkout of an upstream
pull request, branch, or commit, and remove debian/patches/. This also disables
autopkgtests which are not appropriate for testing upstream. Called from
debian/rules if $TEST_UPSTREAM is set.

This will be used for upstream CI.
2016-02-10 13:06:52 +01:00