Build everything using bionic instead of xenial
This commit is contained in:
parent
32f1bfdab3
commit
f1ac1b0121
|
@ -1,30 +0,0 @@
|
||||||
FROM ubuntu:xenial
|
|
||||||
|
|
||||||
ENV LANG C.UTF-8
|
|
||||||
ENV OS_NAME xenial
|
|
||||||
|
|
||||||
RUN apt update -q \
|
|
||||||
&& dpkg --add-architecture i386 \
|
|
||||||
&& apt install -q -y --no-install-recommends \
|
|
||||||
# Base build tools
|
|
||||||
build-essential automake libtool cmake ccache pkg-config autopoint patch \
|
|
||||||
python3-pip python3-setuptools python3-wheel git subversion wget unzip \
|
|
||||||
ninja-build openssh-client curl \
|
|
||||||
# Python (2) is needed to install android-ndk
|
|
||||||
python \
|
|
||||||
# Packaged dependencies
|
|
||||||
libbz2-dev libmagic-dev uuid-dev zlib1g-dev default-jdk \
|
|
||||||
libmicrohttpd-dev libgtest-dev \
|
|
||||||
# Cross compile i586
|
|
||||||
libc6-dev-i386 lib32stdc++6 gcc-multilib g++-multilib \
|
|
||||||
# Other tools (to remove)
|
|
||||||
# vim less grep \
|
|
||||||
&& apt-get clean -y \
|
|
||||||
&& rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \
|
|
||||||
&& pip3 install meson pytest 'markupsafe<2.0.0' 'jinja2<3.0.0' 'gcovr<5.0' requests distro
|
|
||||||
|
|
||||||
# Create user
|
|
||||||
RUN useradd --create-home runner
|
|
||||||
USER runner
|
|
||||||
WORKDIR /home/runner
|
|
||||||
ENV PATH /home/runner/.local/bin:$PATH
|
|
|
@ -13,7 +13,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
variant: [xenial, bionic, f35, focal]
|
variant: [bionic, f35, focal]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
@ -46,7 +46,7 @@ jobs:
|
||||||
- android_arm64
|
- android_arm64
|
||||||
- android_x86
|
- android_x86
|
||||||
- android_x86_64
|
- android_x86_64
|
||||||
image_variant: ['xenial', 'bionic']
|
image_variant: ['bionic']
|
||||||
lib_postfix: ['/x86_64-linux-gnu']
|
lib_postfix: ['/x86_64-linux-gnu']
|
||||||
include:
|
include:
|
||||||
- target: win32_static
|
- target: win32_static
|
||||||
|
@ -55,11 +55,6 @@ jobs:
|
||||||
- target: win32_dyn
|
- target: win32_dyn
|
||||||
image_variant: f35
|
image_variant: f35
|
||||||
lib_postfix: '64'
|
lib_postfix: '64'
|
||||||
exclude:
|
|
||||||
- target: native_desktop
|
|
||||||
image_variant: xenial
|
|
||||||
- target: native_static
|
|
||||||
image_variant: bionic
|
|
||||||
env:
|
env:
|
||||||
HOME: /home/runner
|
HOME: /home/runner
|
||||||
SSH_KEY: /tmp/id_rsa
|
SSH_KEY: /tmp/id_rsa
|
||||||
|
|
|
@ -15,7 +15,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
variant: [xenial, bionic, f35, focal]
|
variant: [bionic, f35, focal]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
@ -46,28 +46,28 @@ jobs:
|
||||||
- android
|
- android
|
||||||
include:
|
include:
|
||||||
- target: native_static
|
- target: native_static
|
||||||
image_variant: xenial
|
image_variant: bionic
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
lib_postfix: '/x86_64-linux-gnu'
|
||||||
- target: native_dyn
|
- target: native_dyn
|
||||||
image_variant: xenial
|
image_variant: bionic
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
lib_postfix: '/x86_64-linux-gnu'
|
||||||
- target: native_mixed
|
- target: native_mixed
|
||||||
image_variant: xenial
|
image_variant: bionic
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
lib_postfix: '/x86_64-linux-gnu'
|
||||||
- target: native_desktop
|
- target: native_desktop
|
||||||
image_variant: bionic
|
image_variant: bionic
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
lib_postfix: '/x86_64-linux-gnu'
|
||||||
- target: armhf_static
|
- target: armhf_static
|
||||||
image_variant: xenial
|
image_variant: bionic
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
lib_postfix: '/x86_64-linux-gnu'
|
||||||
- target: win32_static
|
- target: win32_static
|
||||||
image_variant: f35
|
image_variant: f35
|
||||||
lib_postfix: '64'
|
lib_postfix: '64'
|
||||||
- target: i586_static
|
- target: i586_static
|
||||||
image_variant: xenial
|
image_variant: bionic
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
lib_postfix: '/x86_64-linux-gnu'
|
||||||
- target: android
|
- target: android
|
||||||
image_variant: xenial
|
image_variant: bionic
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
lib_postfix: '/x86_64-linux-gnu'
|
||||||
env:
|
env:
|
||||||
HOME: /home/runner
|
HOME: /home/runner
|
||||||
|
|
Loading…
Reference in New Issue