Commit graph

33 commits

Author SHA1 Message Date
Eberhard Beilharz
c825fb25f8
chore(linux): make debian.sh a builder script
This change modifies `debian.sh` so that it is a full builder script. This
allows further cleanup in `package-build.inc.sh`.

Follows: #15916
Build-bot: skip
Test-bot: skip
2026-05-07 16:55:00 +02:00
Eberhard Beilharz
c1c0c1f926
maint(linux): improve upload-to-debian script 🍒🍒
- directly get PR# from `gh pr create`
- add `Build-bot: skip` trailers
- 🍒-pick of the improved 🍒-pick #14785

Cherry-pick-of: #14785
Build-bot: skip
Test-bot: skip
2025-09-19 15:45:07 +02:00
Eberhard Beilharz
c8bea7496f
maint(linux): remove residues of previous runs on startup 2025-08-29 12:33:06 +02:00
Eberhard Beilharz
cf273a27d9
maint(linux): address code review comments 2025-08-28 16:48:08 +02:00
Eberhard Beilharz
5d8b20dad6
Apply suggestion from @mcdurdin
Co-authored-by: Marc Durdin <marc@durdin.net>
2025-08-28 15:48:22 +02:00
Eberhard Beilharz
6cf43ddace
maint(linux): address code review comments 2025-08-25 17:47:45 +02:00
Eberhard Beilharz
525d54ab65
maint(linux): preserve created package files
Copy the generated files before removing the worktree so that they
are still available for reference.
2025-08-25 15:38:49 +02:00
Eberhard Beilharz
66b6a69909
maint(linux): create temporary worktree for packaging
This change creates a temporary worktree for creating Debian packages.
This will allow us to work from a clean state of the source repo. Also
exclude any generated patch directories (`.pc`).

Build-bot: skip
Test-bot: skip
2025-08-25 15:22:14 +02:00
Marc Durdin
f394245636 maint(common): consolidate builder scripts
Clarifies the confusing builder.inc.sh / build-utils.sh distinction by
giving the scripts more appropriate names. Most build scripts should use
builder-full.inc.sh; some helper scripts can use builder-basic.inc.sh.
Documented in resources/build/README.md.

Renames:
* resources/build/builder.inc.sh to resources/build/builder-full.inc.sh
* resources/build/build-utils.sh to resources/build/builder-basic.inc.sh

Other changes:
* Moves Android-specific functions out of builder-basic.inc.sh and into
  android/build.sh.
* Renames functions in builder-basic.inc.sh

More functions may be moved from builder-basic.inc.sh into utils.inc.sh
or other scripts in the future.

Fixes: #14065
Build-bot: build all
Test-bot: skip
2025-08-02 08:11:24 +10:00
Marc Durdin
65158a0526 maint(common): rename shellHelperFunctions.sh to utils.inc.sh
Adds documentation for various functions, removes unused functions (a
couple of simple, very lightly used functions were unDRYed; these could
go back the other way across all shell scripts if necessary). TODO items
noted for follow-up refactoring.

Fixes: #14275
Relates-to: #14269
Build-bot: build all
Test-bot: skip
2025-08-02 06:58:40 +10:00
Eberhard Beilharz
bd7470fc0e
maint(linux): improve getting PR# in upload-to-debian.sh
With this change we wait two seconds after creating the PR before trying
to get the number of the PR so that GitHub can catch up. Previously
recently it wasn't able to get the PR#.

Also adjust the commit message and use the new header for skipping tests.
2025-05-12 16:41:38 +02:00
Eberhard Beilharz
7010e41b48
docs(linux): add documentation comments 2024-12-11 09:15:52 +01:00
Eberhard Beilharz
bbf8acbda9
fix(linux): pushing of updated changelog branch
This fixes the `upload-to-debian.sh` script if the `chore/linux/changelog`
branch was created a while back while the base branch moved in the
meantime. In this case we have to use `--force` instead of
`--force-with-lease` otherwise `git` gets confused. This is save to do
since the intention is that we replace the previous commit and we know
that there is (should be) only one commit on the `chore/linux/changelog`
branch.
2024-12-10 17:23:43 +01:00
Eberhard Beilharz
4516c9d8df
change(linux): improve changelog PRs after upload to debian
Mention original PR in the body of the cherry-pick PR.
2024-07-25 16:50:38 +02:00
Eberhard Beilharz
a886f2e93d
chore(linux): Be more explicit what to deploy
- Add new `--stable` and `--beta` parameters to be more explicit about
  what to deploy
- Restore current branch at the end
- Output PR# if PR already exists
2024-02-22 14:53:00 +01:00
Eberhard Beilharz
e9c1a9b46f
chore(linux): Ignore existing PRs
Don't try (and fail) to create the PR if it already exists. Instead
simply skip this step because the PR will already be updated by the
`git push`.
2024-02-20 15:32:23 +01:00
Eberhard Beilharz
55f2dbfc19
chore(linux): Unnecessary to checkout stable branch for beta releases 2024-02-20 11:27:13 +01:00
Eberhard Beilharz
d6d0b40fa5
chore(linux): Fix upload-to-debian.sh script for beta releases 2024-02-20 11:21:45 +01:00
Eberhard Beilharz
b4c074ae4f
chore(linux): Fix creation of PRs after uploading to Debian 2023-07-28 08:35:52 +02:00
Marc Durdin
ce864ea923 chore: update standard script prolog to use builtin instead of dirname 2023-02-22 11:04:15 +07:00
Marc Durdin
463c7ff907 chore: remove greadlink from standard script prolog 2023-02-22 10:43:06 +07:00
Eberhard Beilharz
a7ed7ce3c7
Merge pull request #8242 from keymanapp/chore/linux/improve-deb-upload
chore(linux): Create draft PR after updating changelog
2023-02-20 08:58:23 +01:00
Marc Durdin
a004978863 chore: use builder_heading, remove echo_heading 2023-02-20 09:17:51 +07:00
Marc Durdin
4d53a277f3 chore: use builder_die, remove fail 2023-02-20 09:15:38 +07:00
Eberhard Beilharz
696a6ec7da
chore(linux): Create draft PR after updating changelog 2023-02-16 13:10:18 +01:00
Eberhard Beilharz
d1cd46be41
chore(linux): Fix lintian warnings
Also improve upload script to force push changelog branches.
Lintian v2.115 (which is run on Debian servers) still produces
pedantic warnings, but there seems to be a bug - no matter what
pattern I add to `lintian-overrides`, I can't get it to ignore
the files. The following version v2.116 has these rules built in,
so we don't need `lintian-overrides` anymore.

(cherry picked from commit 134e084b80)
2023-02-02 15:28:01 +01:00
Eberhard Beilharz
16c91e695a
chore(linux): Use flag for beta phase
This addresses code review comments.
2022-11-29 08:57:41 +01:00
Eberhard Beilharz
7bec18615f
chore(linux): Fix upload-to-debian script
While we're in beta phase we need to modify `changelog` in beta
branch instead of `master`.
2022-11-28 12:28:01 +01:00
Eberhard Beilharz
ed3a804a7d
fix(linux): Fix upload script 2022-10-19 17:49:34 +02:00
Eberhard Beilharz
ae0378a57f
chore(linux): Add code comment
Follow-up of PR #6997.
2022-07-28 09:43:25 +02:00
Eberhard Beilharz
420cc0814d
chore(linux): Apply suggestions from code review
Co-authored-by: Marc Durdin <marc@durdin.net>
2022-07-28 09:19:25 +02:00
Eberhard Beilharz
9232c20569
chore(linux): address review comments
This change also slightly modifies `echo_heading` and outputs a
mark. This will show to the left of the line as well as in the
scroll bar in a terminal in VSCode [[1]] and will help to find the
headings if you have a lot of output in between.

[1]:https://code.visualstudio.com/updates/v1_69#_setmark-sequence-support
2022-07-27 12:22:55 +02:00
Eberhard Beilharz
ae61410cc9
chore(linux): Add script to upload to debian
- Create and sign source package
- Upload to mentors.debian.net
- Create (and optionally push) commit with updated changelog file
  based on stable branch
- Create (and optionally push) commit with updated changelog file
  based on master branch
2022-07-26 15:39:10 +02:00