diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ef73b04c27eca562d490920fd9c4a188495620b..f541219cebad89075489a29015021d80ef692eeb 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 dbdbb8384f797ba82605640f149e201300229868..8a12bfa9e2af30f73e26f95d75db37ce0548b5a2 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 63a3458319e25256df021bbad724d2da57d54d8b..ecb5654e6895115880e2eb6ddcf9119e5b42f132 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