From 6430638364c159979eda5513ae256bb50726cbee Mon Sep 17 00:00:00 2001 From: jguer Date: Sun, 18 Dec 2022 17:36:15 +0100 Subject: [PATCH 1/5] fix(ci): do not attempt to install extra packages for building pacman-git --- .github/workflows/testing-git.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/testing-git.yml b/.github/workflows/testing-git.yml index 7fbc5ef43..f95ce792a 100644 --- a/.github/workflows/testing-git.yml +++ b/.github/workflows/testing-git.yml @@ -24,8 +24,6 @@ jobs: ${{ runner.os }}-go- - name: checkout pacman-git run: | - pacman -Sy --overwrite=* --noconfirm archlinux-keyring - pacman -Su --overwrite=* --noconfirm sudo base-devel git clone https://aur.archlinux.org/pacman-git useradd github chmod -R 777 pacman-git From 2752f82ecead23bd4ebd022cf8b1ca4e3375c308 Mon Sep 17 00:00:00 2001 From: jguer Date: Sun, 18 Dec 2022 17:39:03 +0100 Subject: [PATCH 2/5] install needed in ci image --- ci.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.Dockerfile b/ci.Dockerfile index 73f7e3a6d..437cebd44 100644 --- a/ci.Dockerfile +++ b/ci.Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app COPY go.mod . RUN pacman -Sy && pacman -S --overwrite=* --noconfirm archlinux-keyring && \ - pacman -Su --overwrite=* --needed --noconfirm go git gcc make && \ + pacman -Su --overwrite=* --needed --noconfirm go git gcc make sudo base-devel && \ rm -rfv /var/cache/pacman/* /var/lib/pacman/sync/* && \ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.50.1 && \ go mod download From 32e2bf9fa9750eafdedfc85b0d1bc5275ebd7772 Mon Sep 17 00:00:00 2001 From: jguer Date: Sun, 18 Dec 2022 18:06:21 +0100 Subject: [PATCH 3/5] fix missing pacman key --- ci.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.Dockerfile b/ci.Dockerfile index 437cebd44..899f61c0d 100644 --- a/ci.Dockerfile +++ b/ci.Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app COPY go.mod . -RUN pacman -Sy && pacman -S --overwrite=* --noconfirm archlinux-keyring && \ +RUN pacman-key --init && pacman -Sy && pacman -S --overwrite=* --noconfirm archlinux-keyring && \ pacman -Su --overwrite=* --needed --noconfirm go git gcc make sudo base-devel && \ rm -rfv /var/cache/pacman/* /var/lib/pacman/sync/* && \ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.50.1 && \ From 8fbd055f250a5a66bd6b0123d9c1987cdd8840c7 Mon Sep 17 00:00:00 2001 From: jguer Date: Sun, 18 Dec 2022 19:04:09 +0100 Subject: [PATCH 4/5] wip --- .github/workflows/testing-git.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing-git.yml b/.github/workflows/testing-git.yml index f95ce792a..afbfa729a 100644 --- a/.github/workflows/testing-git.yml +++ b/.github/workflows/testing-git.yml @@ -26,8 +26,8 @@ jobs: run: | git clone https://aur.archlinux.org/pacman-git useradd github - chmod -R 777 pacman-git echo 'github ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers + chmod -R 777 pacman-git su github -c 'cd pacman-git; yes | makepkg -si --nocheck' - name: Run Build and Tests with pacman-git run: make test From c9b7094639336ddfb814a5d4bf67cc1b7d01979a Mon Sep 17 00:00:00 2001 From: jguer Date: Sun, 18 Dec 2022 19:07:27 +0100 Subject: [PATCH 5/5] add missing deps --- ci.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.Dockerfile b/ci.Dockerfile index 899f61c0d..ae6300cac 100644 --- a/ci.Dockerfile +++ b/ci.Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app COPY go.mod . RUN pacman-key --init && pacman -Sy && pacman -S --overwrite=* --noconfirm archlinux-keyring && \ - pacman -Su --overwrite=* --needed --noconfirm go git gcc make sudo base-devel && \ + pacman -Su --overwrite=* --needed --noconfirm doxygen meson asciidoc go git gcc make sudo base-devel && \ rm -rfv /var/cache/pacman/* /var/lib/pacman/sync/* && \ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.50.1 && \ go mod download