diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-09-29 11:40:16 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-09-29 11:40:16 +0200 |
| commit | 46fb1e5b04a6091e7f050036bfe4eeadb9862154 (patch) | |
| tree | c5110a440a6ecb7816a90bc546a9e1ac8b29a5a5 | |
| parent | f9cdc9210498e3616572b1d9adf80dc85ab36356 (diff) | |
| parent | f1050cb939c328f74ee551a5eaa328e9fc150883 (diff) | |
| download | mullvadvpn-46fb1e5b04a6091e7f050036bfe4eeadb9862154.tar.xz mullvadvpn-46fb1e5b04a6091e7f050036bfe4eeadb9862154.zip | |
Merge branch 'add-dpkg-sig-signature-in-all-deb-files-in-the-normal-build-des-375'
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rwxr-xr-x | ci/buildserver-build.sh | 15 |
2 files changed, 18 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 89eeaf05a9..03b5c2c1ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,9 @@ Line wrap the file at 100 chars. Th - Add customizable relay lists to the CLI on desktop. Custom lists can be managed through `mullvad custom-lists` and can be selected through `mullvad relay set` and `mullvad bridge set`. +#### Linux +- Start signing the deb and rpm files (GPG) + ### Changed #### Android - Migrate welcome view to compose. diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index 6d491bb56f..99453caac0 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -85,6 +85,18 @@ function run_in_build_env { fi } +# Sign DEB+RPM on Linux +function sign_linux_packages { + for installer_path in dist/MullvadVPN-*.deb; do + echo "Signing $installer_path" + dpkg-sig --sign builder "$installer_path" + done + for installer_path in dist/MullvadVPN-*.rpm; do + echo "Signing $installer_path" + rpm --addsign "$installer_path" + done +} + # Builds the app and test artifacts and move them to the passed in `artifact_dir`. # To cross compile pass in `target` as an environment variable # to this function. Must also pass `artifact_dir` to show where to move the built artifacts. @@ -94,6 +106,9 @@ function build { local build_args=("${@}") run_in_build_env TARGETS="$target" ./build.sh "${build_args[@]}" || return 1 + if [[ "$(uname -s)" == "Linux" ]]; then + sign_linux_packages + fi mv dist/*.{deb,rpm,exe,pkg} "$artifact_dir" || return 1 (run_in_build_env gui/scripts/build-test-executable.sh "$target" && \ |
