瀏覽代碼

fix(ci): do not install packages at pacman-git CI level (#1860)

* fix(ci): do not attempt to install extra packages for building pacman-git

* install needed in ci image

* fix missing pacman key

* wip

* add missing deps
Jo 2 年之前
父節點
當前提交
0b1ae938a3
共有 2 個文件被更改,包括 3 次插入5 次删除
  1. 1 3
      .github/workflows/testing-git.yml
  2. 2 2
      ci.Dockerfile

+ 1 - 3
.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

+ 2 - 2
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