From cad24cc1fe471368885005f6497b9f159f1fe2ee Mon Sep 17 00:00:00 2001 From: Christoph Herzog Date: Tue, 20 Feb 2024 15:19:04 +0100 Subject: [PATCH] build: Add alpine setup helper script + add pkgconfig * Add a new alpine linux dependency install script. * Use the script in CI to avoid duplication * Add pkgconfig --- .github/workflows/build.yml | 3 +-- .github/workflows/test.yaml | 12 +++--------- scripts/alpine-linux-install-deps.sh | 7 +++++++ 3 files changed, 11 insertions(+), 11 deletions(-) create mode 100755 scripts/alpine-linux-install-deps.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f83a1b2ed8..a46e46f525f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,8 +91,7 @@ jobs: - uses: actions/checkout@v3 - name: Set up base deps on musl if: matrix.build == 'linux-musl-x64' - run: | - apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++ + run: ./scripts/alpine-linux-install-deps.sh - name: Install Rust uses: dtolnay/rust-toolchain@stable with: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1acfdc144d0..cea5ea784d9 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -354,9 +354,7 @@ jobs: sudo apt-get install --reinstall g++ - name: Set up base deps on musl if: matrix.metadata.build == 'linux-musl' - run: | - apk update - apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ + run: ./scripts/alpine-linux-install-deps.sh - name: Set up dependencies for Mac OS run: | brew install automake @@ -586,9 +584,7 @@ jobs: sudo apt-get install --reinstall g++ - name: Set up base deps on musl if: matrix.metadata.build == 'linux-musl' - run: | - apk update - apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ + run: ./scripts/alpine-linux-install-deps.sh - name: Set up dependencies for Mac OS run: | brew install automake @@ -687,9 +683,7 @@ jobs: version: 0.10.0 - name: Set up base deps on musl if: matrix.build == 'linux-musl' - run: | - apk update - apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ + run: ./scripts/alpine-linux-install-deps.sh - uses: actions/download-artifact@v3 id: download with: diff --git a/scripts/alpine-linux-install-deps.sh b/scripts/alpine-linux-install-deps.sh new file mode 100755 index 00000000000..baa2d633868 --- /dev/null +++ b/scripts/alpine-linux-install-deps.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env sh +# Install package dependencies on Alpine linux. +# +# This script is used by the CI! + +apk update +apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig