Skip to content

Commit d26eb39

Browse files
authored
moved deprecated ubuntu-18.04 from CI-unixish.yml to CI-unixish-docker.yml (#4409)
1 parent dd4c9ae commit d26eb39

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/CI-unixish-docker.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04"]
15+
image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04", "ubuntu:18.04"]
1616
fail-fast: false # Prefer quick result
1717

1818
runs-on: ubuntu-22.04
@@ -36,6 +36,12 @@ jobs:
3636
apt-get install -y cmake g++ make python3 libxml2-utils
3737
apt-get install -y libpcre3-dev
3838
39+
# required so a default Qt installation is configured
40+
- name: Install missing software on ubuntu 18.04
41+
if: false # matrix.os == 'ubuntu-18.04'
42+
run: |
43+
sudo apt-get install qt5-default
44+
3945
# tests require CMake 3.4
4046
- name: Test CMake build (no tests)
4147
if: matrix.image != 'ubuntu:22.10'

.github/workflows/CI-unixish.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
15+
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
1616
fail-fast: false # Prefer quick result
1717

1818
runs-on: ${{ matrix.os }}
@@ -28,12 +28,6 @@ jobs:
2828
sudo apt-get install libtinyxml2-dev
2929
sudo apt-get install qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
3030
31-
# required so a default Qt installation is configured
32-
- name: Install missing software on ubuntu 18.04
33-
if: matrix.os == 'ubuntu-18.04'
34-
run: |
35-
sudo apt-get install qt5-default
36-
3731
# packages for strict cfg checks
3832
- name: Install missing software on ubuntu 22.04
3933
if: matrix.os == 'ubuntu-22.04'

0 commit comments

Comments
 (0)