Skip to content

Commit baddf2a

Browse files
authored
Merge pull request #2009 from profanity-im/fix/2004-Dockerfile-archlinux-image
Enable Arch CI
2 parents 313ab5d + 797e0bc commit baddf2a

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
flavor: [debian, fedora, ubuntu]
15+
flavor: [arch, debian, fedora, ubuntu]
1616

1717
name: Linux
1818
steps:

Dockerfile.arch

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM archlinux/latest
1+
FROM archlinux
22

33
RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
44
autoconf \
@@ -18,6 +18,7 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
1818
libgcrypt \
1919
libmicrohttpd \
2020
libnotify \
21+
libsignal-protocol-c \
2122
libotr \
2223
libtool \
2324
libxss \
@@ -41,18 +42,14 @@ WORKDIR /usr/src/aur
4142
# due to:
4243
# https://www.archlinux.org/news/now-using-zstandard-instead-of-xz-for-package-compression/
4344
RUN wget https://aur.archlinux.org/cgit/aur.git/snapshot/libstrophe-git.tar.gz
44-
RUN wget https://aur.archlinux.org/cgit/aur.git/snapshot/libsignal-protocol-c.tar.gz
4545

4646
RUN tar -zxvf libstrophe-git.tar.gz
47-
RUN tar -zxvf libsignal-protocol-c.tar.gz
4847

4948
RUN pushd libstrophe-git && makepkg && popd
50-
RUN pushd libsignal-protocol-c && makepkg && popd
5149

5250
USER root
5351

5452
RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst
55-
RUN pacman -U --noconfirm libsignal-protocol-c/libsignal-protocol-c-*.pkg.tar.zst
5653

5754
WORKDIR /usr/src
5855
#RUN git clone https://github.com/boothj5/stabber

0 commit comments

Comments
 (0)