Skip to content

Commit 116cf7b

Browse files
committed
Add missing dependencies for new pacman
1 parent ce8127a commit 116cf7b

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/compilation.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [[alpine, bash], [fedora, bash]]
16+
fail-fast: false
1617
steps:
1718
- name: Install dependencies Alpine
1819
if: matrix.os[0] == 'alpine'
1920
run: |
20-
apk add --no-cache build-base bash git autoconf automake python3 py3-pip cmake pkgconfig libarchive-dev openssl-dev gpgme-dev libtool
21+
apk add --no-cache build-base bash git autoconf automake meson ninja-build pacman cmake pkgconfig libarchive-dev openssl-dev gpgme-dev libtool
2122
2223
- name: Install dependencies Fedora
2324
if: matrix.os[0] == 'fedora'
2425
run: |
25-
dnf -y install @development-tools g++ wget xz git autoconf automake python3 python3-pip cmake pkgconf libarchive-devel openssl-devel gpgme-devel libtool
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
2627
2728
- uses: actions/checkout@v4
2829

@@ -54,13 +55,13 @@ jobs:
5455
if: matrix.os[0] == 'ubuntu-latest'
5556
run: |
5657
sudo apt-get update
57-
sudo apt-get -y install libcurl4 libcurl4-openssl-dev libssl-dev libarchive-dev libgpgme-dev
58+
sudo apt-get -y install libcurl4 libcurl4-openssl-dev libssl-dev libarchive-dev libgpgme-dev meson makepkg
5859
5960
- name: Install Dependencies Mac
6061
if: startsWith( matrix.os[0], 'macos' )
6162
run: |
6263
brew update
63-
brew install automake bash openssl libarchive gpgme libtool
64+
brew install automake bash openssl libarchive gpgme libtool meson makepkg
6465
brew reinstall openssl@3 # https://github.com/Homebrew/homebrew-core/issues/169728#issuecomment-2074958306
6566
6667
- name: Compile Tools

depends/check-dependencies.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@ check_program git
6262
check_program patch
6363
check_program autoconf
6464
check_program automake
65+
check_program makepkg
6566

6667
# Disabled pacman for windows
6768
if [ "${OSVER:0:5}" != MINGW ]; then
68-
check_program python3
69-
check_program pip3
69+
check_program meson
70+
check_program ninja
71+
check_program makepkg
7072
check_program gpgrt-config
7173
# check_program gpgme-config
7274
check_header openssl openssl/crypto.h openssl/include/openssl/crypto.h

0 commit comments

Comments
 (0)