Skip to content

Commit

Permalink
build: Add alpine setup helper script + add pkgconfig
Browse files Browse the repository at this point in the history
* Add a new alpine linux dependency install script.
* Use the script in CI to avoid duplication
* Add pkgconfig
  • Loading branch information
theduke committed Feb 20, 2024
1 parent d56e019 commit cad24cc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions scripts/alpine-linux-install-deps.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit cad24cc

Please sign in to comment.