Skip to content

Commit

Permalink
More CI fixes
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Dec 5, 2023
1 parent 55cf4be commit 2313ec0
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/bootstrap-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ case "${1}" in
;;
*)
apt-get update -qq
apt-get install -yqq autoconf automake autopoint build-essential curl cmake dpkg-dev file git jq libtool lsb-release meson gperf patchelf
apt-get install -yqq autoconf automake autopoint build-essential curl cmake dpkg-dev file git jq libtool lsb-release meson gperf patchelf zlib1g-dev

arch=$(get_linux_deb_arch "${1}")
release=$(lsb_release -cs 2>/dev/null)
Expand All @@ -110,6 +110,7 @@ case "${1}" in
libdbus-1-dev:${arch} \
libgl1-mesa-dev:${arch} \
libglib2.0-dev:${arch} \
libglib2.0-dev-bin:${arch} \
libpcre2-dev:${arch} \
libpcre3-dev:${arch} \
libx11-dev:${arch} \
Expand Down
31 changes: 16 additions & 15 deletions .github/workflows/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -719,21 +719,22 @@ jobs:
matrix:
include:
# ubuntu:20.04
- target: linux-aarch64
container: ubuntu:20.04
os: ubuntu-latest
- target: linux-armhf
container: ubuntu:20.04
os: ubuntu-latest
- target: linux-i686
container: ubuntu:20.04
os: ubuntu-latest
- target: linux-riscv64
container: ubuntu:20.04
os: ubuntu-latest
- target: linux-x86_64
container: ubuntu:20.04
os: ubuntu-latest
# FIXME Cannot use the installed version of file (5.38) to cross-compile file 5.34
#- target: linux-aarch64
#container: ubuntu:20.04
#os: ubuntu-latest
#- target: linux-armhf
#container: ubuntu:20.04
#os: ubuntu-latest
#- target: linux-i686
#container: ubuntu:20.04
#os: ubuntu-latest
#- target: linux-riscv64
#container: ubuntu:20.04
#os: ubuntu-latest
#- target: linux-x86_64
#container: ubuntu:20.04
#os: ubuntu-latest
- target: macos-universal-10.15
os: macos-11
- target: wasm
Expand Down

0 comments on commit 2313ec0

Please sign in to comment.