Fix: [Actions] Ubuntu 18.04 by default has a compiler too old for OpenTTD (#9481)

This commit is contained in:
Patric Stout 2021-08-15 13:08:58 +02:00 committed by GitHub
parent cb9a2dec0d
commit b67ef1e5b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions

View File

@ -373,14 +373,19 @@ jobs:
include: include:
- container_image: "ubuntu:18.04" - container_image: "ubuntu:18.04"
bundle_name: "bionic" bundle_name: "bionic"
compiler: "g++-8"
- container_image: "ubuntu:20.04" - container_image: "ubuntu:20.04"
bundle_name: "focal" bundle_name: "focal"
compiler: "g++"
- container_image: "ubuntu:20.10" - container_image: "ubuntu:20.10"
bundle_name: "groovy" bundle_name: "groovy"
compiler: "g++"
- container_image: "debian:buster" - container_image: "debian:buster"
bundle_name: "buster" bundle_name: "buster"
compiler: "g++"
- container_image: "debian:bullseye" - container_image: "debian:bullseye"
bundle_name: "bullseye" bundle_name: "bullseye"
compiler: "g++"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: container:
@ -406,7 +411,7 @@ jobs:
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
cmake \ cmake \
debhelper \ debhelper \
g++ \ ${{ matrix.compiler }} \
git \ git \
make \ make \
openssl \ openssl \
@ -432,7 +437,7 @@ jobs:
cd build cd build
echo "::group::CMake" echo "::group::CMake"
cmake ${GITHUB_WORKSPACE} \ CXX=${{ matrix.compiler }} cmake ${GITHUB_WORKSPACE} \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
# EOF # EOF