moved deprecated `ubuntu-18.04` from `CI-unixish.yml` to `CI-unixish-docker.yml` (#4409)

This commit is contained in:
Oliver Stöneberg 2022-08-27 15:05:40 +02:00 committed by GitHub
parent dd4c9ae902
commit d26eb3903e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View File

@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04"]
image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04", "ubuntu:18.04"]
fail-fast: false # Prefer quick result
runs-on: ubuntu-22.04
@ -36,6 +36,12 @@ jobs:
apt-get install -y cmake g++ make python3 libxml2-utils
apt-get install -y libpcre3-dev
# required so a default Qt installation is configured
- name: Install missing software on ubuntu 18.04
if: false # matrix.os == 'ubuntu-18.04'
run: |
sudo apt-get install qt5-default
# tests require CMake 3.4
- name: Test CMake build (no tests)
if: matrix.image != 'ubuntu:22.10'

View File

@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
fail-fast: false # Prefer quick result
runs-on: ${{ matrix.os }}
@ -28,12 +28,6 @@ jobs:
sudo apt-get install libtinyxml2-dev
sudo apt-get install qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
# required so a default Qt installation is configured
- name: Install missing software on ubuntu 18.04
if: matrix.os == 'ubuntu-18.04'
run: |
sudo apt-get install qt5-default
# packages for strict cfg checks
- name: Install missing software on ubuntu 22.04
if: matrix.os == 'ubuntu-22.04'