| Commit message (Collapse) | Author | Age |
|
|
|
|
|
|
| |
When --debian-tag is set to '' empty string, gbp will push the tip of
the debian branch to remote.
Small typo fix also: s/branach/branch/
|
|
|
|
|
|
| |
This works just fine when git can fast forward, i.e. with untracked
content or changes in tracked files that are not touched by the commits.
In case fast forward is not possible gbp will complain anyhow.
|
|
|
|
| |
Now that is passes let's make sure it stays that way.
|
|
|
|
| |
Gbp-Dch: Ignore
|
| |
|
|
|
|
|
|
|
| |
If 'run-in-container x' was issued, script would fail silently. With
this change it will properly exit with 'bad action: x' and help message.
Also fix a bunch of other minor issues detected by ShellCheck.
|
|
|
|
| |
This is necessary to be able to use static Dockerfile analyzers.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Typically developers have either Docker or Podman on their laptops for
running containers. As Podman follows nearly identical syntax as Docker,
add new option '-c' that allows to specify Podman or Docker as the
container command, with Podman being default if nothing is defined as
the main developer is using Podman.
Also ignore log files both in .gitignore and resulting .dockerignore so
that tests runs can be logged with 'tee x.log' without triggering
rebuilds of the container via polluting the 'COPY . .' step.
|
|
|
|
|
| |
The debian/changelog has many spelling errors but not touching them now
as changing past changelog entries might be contentious.
|
| |
|
|
|
|
|
| |
In code standardize on using 'commitish' while docs have 'commit-ish'
like upstream git convention seems to be.
|
|
|
|
|
|
| |
To make setup.py happy we moved to an underscore path name in
2f47ec4c ("setup: Move most options to setup.cfg")
|
|
|
|
| |
dh_installchangelogs handles that
|
|
|
|
|
| |
We can move everything that doesn't depend on running a script
or evaluating environment variables.
|
|
|
|
|
| |
We for zsh we can at least catch syntax errors and use shellcheck for
bash.
|
|
|
|
|
|
|
|
|
|
|
|
| |
Salsa-CI jobs 'build' and 'build i386' were failing on the error:
/usr/lib/python3/dist-packages/setuptools/dist.py:509: SetuptoolsDeprecationWarning: Invalid version: '0.9.33+salsaci+20240105+6'.
!!
********************************************************************************
The version specified is not a valid version according to PEP 440.
Disabling the version automatic version bump in Salsa-CI satisfies
Python setuptools and build passes.
|
| |
|
|
|
|
|
| |
While we want to specify a tight dependency on the upstream version the
Debian revision is not needed.
|
|
|
|
| |
Closes: #1058551
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Explicitly specify the git version to facilitate easier backporting.
Developers can align with this git version to reduce false alarms due
to version inconsistencies.
The latest git-buildpackage requires a newer git version to avoid test
failures. For example, building the source in bookworm with git 1:2.39.2-1.1
results in:
$ ./packaging/run-in-docker -t bookworm
FAIL: Doctest: tests.doctests.test_GitRepository.test_clone
----------------------------------------------------------------------
Traceback (most recent call last):
File "/usr/lib/python3.11/doctest.py", line 2222, in runTest
raise self.failureException(self.format_failure(new.getvalue()))
AssertionError: Failed doctest test for test_clone
File "/workdir/project/tests/doctests/test_GitRepository.py", line 626, in test_clone
----------------------------------------------------------------------
File "/workdir/project/tests/doctests/test_GitRepository.py", line 649, in test_clone
Failed example:
clone.get_remote_branches()
Expected:
['origin', 'origin/foo', 'origin/master']
Got:
['origin/HEAD', 'origin/foo', 'origin/master']
-------------------- >> begin captured logging << --------------------
gbp: debug: ['git', 'rev-parse', '--show-cdup']
gbp: debug: ['git', 'rev-parse', '--is-bare-repository']
gbp: debug: ['git', 'rev-parse', '--git-dir']
gbp: debug: ['git', 'symbolic-ref', 'HEAD']
gbp: debug: ['git', 'show-ref', 'refs/heads/master']
gbp: debug: ['git', 'clone', '--quiet', '/tmp/tmp72nxjjwzgbp_tests.doctests.test_GitRepository_/repo']
gbp: debug: ['git', 'rev-parse', '--show-cdup']
gbp: debug: ['git', 'rev-parse', '--is-bare-repository']
gbp: debug: ['git', 'rev-parse', '--git-dir']
gbp: debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/']
gbp: debug: ['git', 'symbolic-ref', 'HEAD']
gbp: debug: ['git', 'show-ref', 'refs/heads/master']
gbp: debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/remotes/']
gbp: debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/']
gbp: debug: ['git', 'config', 'branch.master.remote']
gbp: debug: ['git', 'config', 'branch.master.merge']
gbp: debug: ['git', 'branch', 'foo', 'origin/foo']
gbp: debug: ['git', 'config', 'branch.foo.remote']
gbp: debug: ['git', 'config', 'branch.foo.merge']
gbp: debug: ['git', 'branch', 'bar']
gbp: debug: ['git', 'config', 'branch.bar.remote']
gbp: debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/']
gbp: debug: ['git', 'remote']
gbp: debug: ['git', 'remote']
gbp: debug: ['git', 'remote', 'show', '-n', 'origin']
gbp: debug: ['git', 'show-ref', '--verify', 'refs/remotes/origin/master']
gbp: debug: ['git', 'remote']
gbp: debug: ['git', 'remote', 'show', '-n', 'origin']
--------------------- >> end captured logging << ---------------------
|
|
|
|
| |
Nicer than printing a stack trace
|
| |
|
| |
|
| |
|
|
|
|
|
| |
pydoctor gets tripped up easily. Let's rather look into switching
to sphinx or s.th. similar.
|
| |
|
|
|
|
|
|
|
| |
E.g. python-coverage has a form feed in the series file.
Closes: #1030534
Thanks: Ian Jackson for the detailed report
|
|
|
|
|
|
| |
Drop the pq branch on all exceptions not only on the ones gbp throws
itself. This makes sure the result is consistent in such situations (no
patches applied).
|
|
|
|
|
|
| |
Print a clear error message instead of hiding it in the backtrace.
Thanks: Mechtilde Stehmann for the report
|
|
|
|
|
|
|
|
| |
This reverts commit a3fa6715a9900b34e38797832996be9f56e99be7.
Git went back to the old (correct) format.
Gbp-Dch: Ignore
|
|
|
|
|
|
|
|
|
| |
gbp-pq manpage refers to a page that says the content has moved.
I think it can refer to the local html copy[1], or the internet copy.
[1] /usr/share/doc/git-buildpackage/manual-html/gbp.patches.html
Closes: #1035838
|
| |
|
| |
|
|
|
|
|
|
|
| |
They're needed when packaging upstream beta versions. So use
a positive list instead.
Fixes: a5575e178639a8e167c7f3090263a03b362e05e7
|
|
|
|
|
|
|
|
|
| |
This parses common Debian version patterns into the "real" upstream
version. For example, 1.1.8+dfsg1 becomes 1.1.8. This strips epochs,
handles the +really convention, finds git revisions, and strips other +
or ~ patterns.
Closes: #968329
|
|
|
|
|
|
| |
This avoids `tag.gpgsign = true` from git-config leaking through.
Closes: #1032932
|
|
|
|
| |
Don't confuse users with a backtrace.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
As stated in the documentation at
https://rpm-packaging-guide.github.io/#working-with-spec-files
"...
Follow this format for the first line:
* Day-of-Week Month Day Year Name Surname <email> - Version-Release
..."
|
|
|
|
| |
Gbp-Dch: Ignore
|
| |
|
|
|
|
| |
Not everyone just puts built debs to ../
|
| |
|
|
|
|
| |
No changes required
|
|
|
|
| |
Closes: #1023379
|
|
|
|
| |
Gbp-Dch: Ignore
|
| |
|
| |
|
|
|
|
| |
This works around #1020024
|