Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Briar Desktop
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
Briar Desktop
Commits
06061492
Verified
Commit
06061492
authored
2 years ago
by
Sebastian
Committed by
Mikolai Gütschow
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Configure deb creation for Ubuntu Jammy
parent
b521e17e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!280
Vagrant setup for testing deb installability and configure deb for Ubuntu Jammy
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+6
-0
6 additions, 0 deletions
.gitlab-ci.yml
briar-desktop/build.gradle.kts
+10
-0
10 additions, 0 deletions
briar-desktop/build.gradle.kts
vagrant/ubuntu-jammy/bootstrap.sh
+1
-1
1 addition, 1 deletion
vagrant/ubuntu-jammy/bootstrap.sh
with
17 additions
and
1 deletion
.gitlab-ci.yml
+
6
−
0
View file @
06061492
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
briar-desktop/build.gradle.kts
+
10
−
0
View file @
06061492
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
vagrant/ubuntu-jammy/bootstrap.sh
+
1
−
1
View file @
06061492
...
...
@@ -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-2
0
.04.deb?job=b_package_linux"
wget
-O
briar.deb
"https://code.briarproject.org/briar/briar-desktop/-/jobs/artifacts/main/raw/briar-desktop-ubuntu-2
2
.04.deb?job=b_package_linux"
sudo
dpkg
-i
briar.deb
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment