Skip to content

Commit ad291ff

Browse files
authored
Allow root installs for psp-pacman in docker and CI
1 parent 265a97b commit ad291ff

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

.github/workflows/compilation.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,17 @@ jobs:
1818
- name: Install dependencies Alpine
1919
if: matrix.os[0] == 'alpine'
2020
run: |
21-
apk add --no-cache build-base bash git autoconf automake meson ninja-build pacman cmake pkgconfig libarchive-dev openssl-dev gpgme-dev libtool
21+
apk add --no-cache build-base bash git autoconf automake meson ninja-build cmake pkgconfig libarchive-dev openssl-dev gpgme-dev libtool
2222
2323
- name: Install dependencies Fedora
2424
if: matrix.os[0] == 'fedora'
2525
run: |
26-
dnf -y install @development-tools g++ wget xz git autoconf automake meson ninja-build makepkg cmake pkgconf libarchive-devel openssl-devel gpgme-devel libtool
26+
dnf -y install @development-tools g++ wget xz git autoconf automake meson ninja-build cmake pkgconf libarchive-devel openssl-devel gpgme-devel libtool
2727
2828
- uses: actions/checkout@v4
2929

3030
- name: Compile Tools
3131
run: |
32-
chown -R $(id -nu):$(id -ng) .
3332
export PSPDEV=$PWD/pspdev
3433
export PATH=$PATH:$PSPDEV/bin
3534
./build-all.sh

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENV PATH $PATH:${PSPDEV}/bin
66

77
COPY . /src
88

9-
RUN apk add build-base bash git autoconf automake cmake pkgconfig libarchive-dev openssl-dev gpgme-dev libtool curl-dev meson ninja-build pacman
9+
RUN apk add build-base bash git autoconf automake cmake pkgconfig libarchive-dev openssl-dev gpgme-dev libtool curl-dev meson ninja-build
1010
RUN cd /src && ./build-all.sh
1111

1212
# Second stage of Dockerfile

0 commit comments

Comments
 (0)