From 06061492454d258a9043c2ce0e0bf33c5b4b6cc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Fri, 20 Jan 2023 16:34:30 +0100
Subject: [PATCH] Configure deb creation for Ubuntu Jammy
---
.gitlab-ci.yml | 6 ++++++
briar-desktop/build.gradle.kts | 10 ++++++++++
vagrant/ubuntu-jammy/bootstrap.sh | 2 +-
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ef73b04c2..f541219ceb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,13 +48,16 @@ b_package_linux:
pinpitPackageDefaultDebDebianBullseyeX64
pinpitPackageDefaultDebUbuntuBionicX64
pinpitPackageDefaultDebUbuntuFocalX64
+ pinpitPackageDefaultDebUbuntuJammyX64
- ls -lrth briar-desktop/build/pinpit/jars/Briar-linux-*.jar
- ls -lrth briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-ubuntu-18.04-x64-*.deb
- ls -lrth briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-ubuntu-20.04-x64-*.deb
+ - ls -lrth briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-ubuntu-22.04-x64-*.deb
- ls -lrth briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-debian-bullseye-x64-*.deb
- mv briar-desktop/build/pinpit/jars/Briar-linux-*.jar ./briar-desktop-linux.jar
- mv briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-ubuntu-18.04-x64-*.deb ./briar-desktop-ubuntu-18.04.deb
- mv briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-ubuntu-20.04-x64-*.deb ./briar-desktop-ubuntu-20.04.deb
+ - mv briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-ubuntu-22.04-x64-*.deb ./briar-desktop-ubuntu-22.04.deb
- mv briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-debian-bullseye-x64-*.deb ./briar-desktop-debian-bullseye.deb
artifacts:
paths:
@@ -99,13 +102,16 @@ rb_package_linux:
pinpitPackageDefaultDebDebianBullseyeX64
pinpitPackageDefaultDebUbuntuBionicX64
pinpitPackageDefaultDebUbuntuFocalX64
+ pinpitPackageDefaultDebUbuntuJammyX64
- ls -lrth briar-desktop/build/pinpit/jars/Briar-linux-*.jar
- ls -lrth briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-ubuntu-18.04-x64-*.deb
- ls -lrth briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-ubuntu-20.04-x64-*.deb
+ - ls -lrth briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-ubuntu-22.04-x64-*.deb
- ls -lrth briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-debian-bullseye-x64-*.deb
- mv briar-desktop/build/pinpit/jars/Briar-linux-*.jar ./briar-desktop-linux.jar
- mv briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-ubuntu-18.04-x64-*.deb ./briar-desktop-ubuntu-18.04.deb
- mv briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-ubuntu-20.04-x64-*.deb ./briar-desktop-ubuntu-20.04.deb
+ - mv briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-ubuntu-22.04-x64-*.deb ./briar-desktop-ubuntu-22.04.deb
- mv briar-desktop/build/pinpit/binaries/main-default/linux/x64/deb/briar-desktop-debian-bullseye-x64-*.deb ./briar-desktop-debian-bullseye.deb
artifacts:
paths:
diff --git a/briar-desktop/build.gradle.kts b/briar-desktop/build.gradle.kts
index dbdbb8384f..8a12bfa9e2 100644
--- a/briar-desktop/build.gradle.kts
+++ b/briar-desktop/build.gradle.kts
@@ -175,6 +175,16 @@ pinpit.desktop {
// This uses a combination of `ldd` and `dpkg -S` on each `.so` file shipped with the app
// to find out which other shared libraries this depends on and which Debian package
// provides it.
+ deb("UbuntuJammyX64") {
+ qualifier = "ubuntu-22.04"
+ arch = "x64"
+ depends(
+ // determined by pinpitSuggestDebDependencies
+ "libc6", "libexpat1", "zlib1g",
+ // manually added
+ "xdg-utils", "libnotify4"
+ )
+ }
deb("UbuntuFocalX64") {
qualifier = "ubuntu-20.04"
arch = "x64"
diff --git a/vagrant/ubuntu-jammy/bootstrap.sh b/vagrant/ubuntu-jammy/bootstrap.sh
index 63a3458319..ecb5654e68 100644
--- a/vagrant/ubuntu-jammy/bootstrap.sh
+++ b/vagrant/ubuntu-jammy/bootstrap.sh
@@ -3,5 +3,5 @@
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y xauth xdg-utils libnotify4 libasound2
-wget -O briar.deb "https://code.briarproject.org/briar/briar-desktop/-/jobs/artifacts/main/raw/briar-desktop-ubuntu-20.04.deb?job=b_package_linux"
+wget -O briar.deb "https://code.briarproject.org/briar/briar-desktop/-/jobs/artifacts/main/raw/briar-desktop-ubuntu-22.04.deb?job=b_package_linux"
sudo dpkg -i briar.deb
--
GitLab