diff --git a/.github/workflows/bootstrap-deps.sh b/.github/workflows/bootstrap-deps.sh index d581bd4..0aa85ac 100755 --- a/.github/workflows/bootstrap-deps.sh +++ b/.github/workflows/bootstrap-deps.sh @@ -57,12 +57,22 @@ function install_compiler() { "win32") dpkg --add-architecture i386 apt-get update -qq - apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable + apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 + if [ "$(lsb_release -si 2>/dev/null)" = "Debian" ]; then + apt-get install -yqq wine wine32 + else + apt-get install -yqq wine-stable + fi ;; "win64") dpkg --add-architecture i386 apt-get update -qq - apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable + apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 + if [ "$(lsb_release -si 2>/dev/null)" = "Debian" ]; then + apt-get install -yqq wine wine32 wine64 + else + apt-get install -yqq wine-stable + fi ;; esac } @@ -74,8 +84,6 @@ case "${1}" in [ -n "${GITHUB_ENV}" ] && echo "PAWPAW_PACK_NAME=${1}-$(sw_vers -productVersion)" >> "${GITHUB_ENV}" ;; *) - sed -i "s/deb http/deb [arch=i386,amd64] http/" /etc/apt/sources.list - sed -i "s/deb mirror/deb [arch=i386,amd64] mirror/" /etc/apt/sources.list apt-get update -qq apt-get install -yqq autoconf automake autopoint binfmt-support build-essential curl cmake git jq lsb-release meson gperf patchelf qemu-user-static @@ -83,12 +91,17 @@ case "${1}" in release=$(lsb_release -cs) if [ -n "${arch}" ]; then - dpkg --add-architecture ${arch} - if [ "${arch}" != "amd64" ] && [ "${arch}" != "i386" ]; then - echo "deb [arch=${arch}] http://ports.ubuntu.com/ubuntu-ports ${release} main restricted universe multiverse" | tee -a /etc/apt/sources.list - echo "deb [arch=${arch}] http://ports.ubuntu.com/ubuntu-ports ${release}-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list - echo "deb [arch=${arch}] http://ports.ubuntu.com/ubuntu-ports ${release}-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list + if [ "$(lsb_release -si 2>/dev/null)" != "Debian" ]; then + sed -i "s/deb http/deb [arch=i386,amd64] http/" /etc/apt/sources.list + sed -i "s/deb mirror/deb [arch=i386,amd64] mirror/" /etc/apt/sources.list + if [ "${arch}" != "amd64" ] && [ "${arch}" != "i386" ]; then + echo "deb [arch=${arch}] http://ports.ubuntu.com/ubuntu-ports ${release} main restricted universe multiverse" | tee -a /etc/apt/sources.list + echo "deb [arch=${arch}] http://ports.ubuntu.com/ubuntu-ports ${release}-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list + echo "deb [arch=${arch}] http://ports.ubuntu.com/ubuntu-ports ${release}-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list + fi fi + + dpkg --add-architecture ${arch} apt-get update -qq apt-get install -yqq \ libasound2-dev:${arch} \ diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 8d3ba35..268baff 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -21,6 +21,28 @@ jobs: os: macos-11 - target: macos-universal-10.15 os: macos-11 + # debian:12 + - target: linux-aarch64 + container: debian:12 + os: ubuntu-latest + - target: linux-armhf + container: debian:12 + os: ubuntu-latest + - target: linux-i686 + container: debian:12 + os: ubuntu-latest + - target: linux-x86_64 + container: debian:12 + os: ubuntu-latest + - target: wasm + container: debian:12 + os: ubuntu-latest + - target: win32 + container: debian:12 + os: ubuntu-latest + - target: win64 + container: debian:12 + os: ubuntu-latest # ubuntu:18.04 - target: linux-aarch64 container: ubuntu:18.04 @@ -136,18 +158,19 @@ jobs: - target: macos-universal-10.15 os: macos-11 # ubuntu:18.04 - - target: linux-aarch64 - container: ubuntu:18.04 - os: ubuntu-latest - - target: linux-armhf - container: ubuntu:18.04 - os: ubuntu-latest - - target: linux-i686 - container: ubuntu:18.04 - os: ubuntu-latest - - target: linux-x86_64 - container: ubuntu:18.04 - os: ubuntu-latest + # FIXME needs new cmake + #- target: linux-aarch64 + #container: ubuntu:18.04 + #os: ubuntu-latest + #- target: linux-armhf + #container: ubuntu:18.04 + #os: ubuntu-latest + #- target: linux-i686 + #container: ubuntu:18.04 + #os: ubuntu-latest + #- target: linux-x86_64 + #container: ubuntu:18.04 + #os: ubuntu-latest # ubuntu:20.04 - target: linux-aarch64 container: ubuntu:20.04