From bbc88557a4ac338edebb5490b70c05dd4e5ec424 Mon Sep 17 00:00:00 2001 From: belmiro adriano Date: Thu, 31 Oct 2024 13:01:11 -0400 Subject: [PATCH 1/3] ci: replace archlinux tag in Dockerfile This pull request addresses an error in the Dockerfile.arch file caused by using an incorrect base image reference (archlinux/latest). The Docker Hub archlinux repository does not support a latest tag, which leads to a "failed to resolve source metadata" error during the Docker build process. This PR updates the base image reference to archlinux, resolving the error and allowing for a successful build. Fix https://github.com/profanity-im/profanity/issues/2004 Note: Commit message edited by @jubalh since @tjsweetblack didn't respond. --- Dockerfile.arch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.arch b/Dockerfile.arch index d4c4e0a129..e3d78f5256 100644 --- a/Dockerfile.arch +++ b/Dockerfile.arch @@ -1,4 +1,4 @@ -FROM archlinux/latest +FROM archlinux RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \ autoconf \ From d7398d11e1154e6b58200da31038049e405dd72a Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Sun, 5 Jan 2025 18:39:58 +0100 Subject: [PATCH 2/3] ci: re-enable arch This reverts commit 3def839c0ed01fbacf8406ef5961caa666110df3. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bfe55ff97f..406b58fdaa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - flavor: [debian, fedora, ubuntu] + flavor: [arch, debian, fedora, ubuntu] name: Linux steps: From 797e0bc3ce2a27583d64bea4b10c3a8039920a1e Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 6 Jan 2025 10:07:43 +0100 Subject: [PATCH 3/3] ci: use official libsignal package instead of aur This fixes the build as well. --- Dockerfile.arch | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile.arch b/Dockerfile.arch index e3d78f5256..3fe70dff81 100644 --- a/Dockerfile.arch +++ b/Dockerfile.arch @@ -18,6 +18,7 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \ libgcrypt \ libmicrohttpd \ libnotify \ + libsignal-protocol-c \ libotr \ libtool \ libxss \ @@ -41,18 +42,14 @@ WORKDIR /usr/src/aur # due to: # https://www.archlinux.org/news/now-using-zstandard-instead-of-xz-for-package-compression/ RUN wget https://aur.archlinux.org/cgit/aur.git/snapshot/libstrophe-git.tar.gz -RUN wget https://aur.archlinux.org/cgit/aur.git/snapshot/libsignal-protocol-c.tar.gz RUN tar -zxvf libstrophe-git.tar.gz -RUN tar -zxvf libsignal-protocol-c.tar.gz RUN pushd libstrophe-git && makepkg && popd -RUN pushd libsignal-protocol-c && makepkg && popd USER root RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst -RUN pacman -U --noconfirm libsignal-protocol-c/libsignal-protocol-c-*.pkg.tar.zst WORKDIR /usr/src #RUN git clone https://github.com/boothj5/stabber