Skip to content

Commit c90008c

Browse files
committed
release: use zellij
1 parent 193d9a0 commit c90008c

File tree

4 files changed

+35
-34
lines changed

4 files changed

+35
-34
lines changed

build-systems/.tmuxinator.yml

-25
This file was deleted.

build-systems/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:latest
33

44
ENV DEBIAN_FRONTEND=noninteractive
55
RUN apt-get update
6-
RUN apt-get -y install bash tmuxinator \
6+
RUN apt-get -y install bash \
77
build-essential autoconf automake autotools-dev dh-make debhelper \
88
devscripts fakeroot xutils lintian pbuilder cdbs gnupg \
99
python3 python3-pip osc xz-utils git rsync qttools5-dev-tools \
@@ -13,10 +13,18 @@ RUN apt-get -y install bash tmuxinator \
1313
libqt6svg6 libqt6svgwidgets6 libqt6websockets6 libqt6core5compat6 \
1414
libqt6core5compat6-dev gh
1515

16+
# Download and extract zellij
17+
RUN curl -L https://github.com/zellij-org/zellij/releases/download/v0.39.2/zellij-x86_64-unknown-linux-musl.tar.gz -o zellij.tar.gz \
18+
&& tar -xzvf zellij.tar.gz \
19+
&& rm zellij.tar.gz \
20+
&& chmod +x zellij \
21+
&& mv zellij /usr/local/bin
22+
1623
# QOwnNotes repo is supposed to be mounted to /QOwnNotes
1724
RUN useradd -ms /bin/bash release
1825
USER release
1926
WORKDIR /home/release
27+
2028
# osc needs m2crypto:
2129
RUN pip3 install m2crypto
2230
RUN mkdir /home/release/.ssh -m 0700

build-systems/build-all.sh

+5-8
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,11 @@ echo "Starting the deployment process for all platforms..."
3333

3434
cd "$DIR" || exit 1
3535

36-
# kill the previous tmux session
37-
tmux kill-session -t deploy-qownnotes
38-
39-
# start a new deployment session with all deployment scripts from .tmuxinator.yml
40-
# you'll need https://github.com/tmuxinator/tmuxinator
41-
# install: sudo gem install tmuxinator
42-
# update: sudo gem update tmuxinator
43-
tmuxinator start deploy-qownnotes
36+
# kill the previous session
37+
zellij delete-session deploy-qownnotes
38+
39+
# start a new deployment session with all deployment scripts from releaser.kdl
40+
zellij --layout releaser.kdl attach deploy-qownnotes -c
4441

4542
exit
4643

build-systems/releaser.kdl

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
layout {
2+
pane split_direction="vertical" {
3+
pane name="launchpad" command="../ubuntu-launchpad/build-for-launchpad.sh"
4+
pane name="obs" command="../obs/build-for-obs.sh"
5+
}
6+
pane split_direction="vertical" {
7+
pane name="aur" command="aur/build-for-aur.sh"
8+
pane name="gentoo" command="gentoo/build-for-gentoo.sh"
9+
}
10+
pane split_direction="vertical" {
11+
pane name="slackware" command="slackware/build-for-slackware.sh"
12+
pane name="snap" command="snap/build-for-launchpad-snap.sh"
13+
}
14+
pane split_direction="vertical" {
15+
pane name="launchpad-qt6" command="../ubuntu-launchpad/build-for-launchpad-qt6.sh"
16+
pane focus=true
17+
}
18+
pane size=1 borderless=true {
19+
plugin location="zellij:status-bar"
20+
}
21+
}

0 commit comments

Comments
 (0)