diff --git a/.github/workflows/testing-git.yml b/.github/workflows/testing-git.yml index 7fbc5ef43..afbfa729a 100644 --- a/.github/workflows/testing-git.yml +++ b/.github/workflows/testing-git.yml @@ -24,12 +24,10 @@ 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 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 diff --git a/ci.Dockerfile b/ci.Dockerfile index 73f7e3a6d..ae6300cac 100644 --- a/ci.Dockerfile +++ b/ci.Dockerfile @@ -5,8 +5,8 @@ WORKDIR /app COPY go.mod . -RUN pacman -Sy && pacman -S --overwrite=* --noconfirm archlinux-keyring && \ - pacman -Su --overwrite=* --needed --noconfirm go git gcc make && \ +RUN pacman-key --init && pacman -Sy && pacman -S --overwrite=* --noconfirm archlinux-keyring && \ + 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