From f49637f2a344b0b530322c6d10f27bb73318782e Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 5 Dec 2023 13:26:43 +0100 Subject: [PATCH] Add debian:12 to CI Signed-off-by: falkTX --- .github/workflows/bootstrap-deps.sh | 9 ++++-- .github/workflows/bootstrap.yml | 47 +++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 15 deletions(-) diff --git a/.github/workflows/bootstrap-deps.sh b/.github/workflows/bootstrap-deps.sh index d581bd4..662118d 100755 --- a/.github/workflows/bootstrap-deps.sh +++ b/.github/workflows/bootstrap-deps.sh @@ -74,8 +74,11 @@ 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 + if [ ! -e /etc/debian_version ]; 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 + fi + 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 @@ -84,7 +87,7 @@ case "${1}" in if [ -n "${arch}" ]; then dpkg --add-architecture ${arch} - if [ "${arch}" != "amd64" ] && [ "${arch}" != "i386" ]; then + if [ "${arch}" != "amd64" ] && [ "${arch}" != "i386" ] && [ ! -e /etc/debian_version ]; 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 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