use `ubuntu-22.04` as main/base distro in CI (#4129)

This commit is contained in:
Oliver Stöneberg 2022-05-31 19:55:57 +02:00 committed by GitHub
parent 5e2afacdb9
commit 703396e549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 33 additions and 25 deletions

View File

@ -9,10 +9,10 @@ jobs:
strategy: strategy:
matrix: matrix:
image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04", "ubuntu:22.04"] image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04"]
fail-fast: false # Prefer quick result fail-fast: false # Prefer quick result
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
container: container:
image: ${{ matrix.image }} image: ${{ matrix.image }}
@ -35,7 +35,7 @@ jobs:
# tests require CMake 3.4 # tests require CMake 3.4
- name: Test CMake build (no tests) - name: Test CMake build (no tests)
if: matrix.image != 'ubuntu:22.04' if: matrix.image != 'ubuntu:22.10'
run: | run: |
mkdir cmake.output mkdir cmake.output
cd cmake.output cd cmake.output
@ -44,7 +44,7 @@ jobs:
cd .. cd ..
- name: Test CMake build - name: Test CMake build
if: matrix.image == 'ubuntu:22.04' if: matrix.image == 'ubuntu:22.10'
run: | run: |
mkdir cmake.output mkdir cmake.output
cd cmake.output cd cmake.output

View File

@ -9,7 +9,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11, macos-12] os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, macos-10.15, macos-11, macos-12]
fail-fast: false # Prefer quick result fail-fast: false # Prefer quick result
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@ -23,11 +23,17 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install libxml2-utils sudo apt-get install libxml2-utils
sudo apt-get install libtinyxml2-dev sudo apt-get install libtinyxml2-dev
sudo apt-get install qtbase5-dev qttools5-dev libqt5charts5-dev qt5-default 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 # packages for strict cfg checks
- name: Install missing software on ubuntu 20.04 - name: Install missing software on ubuntu 22.04
if: matrix.os == 'ubuntu-20.04' if: matrix.os == 'ubuntu-22.04'
run: | run: |
sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libwxgtk3.0-gtk3-dev xmlstarlet sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libwxgtk3.0-gtk3-dev xmlstarlet
@ -134,12 +140,12 @@ jobs:
# fails on macos since some includes (e.g. sys/epoll.h) are not available # fails on macos since some includes (e.g. sys/epoll.h) are not available
- name: Run cfg tests - name: Run cfg tests
if: contains(matrix.os, 'ubuntu') && matrix.os != 'ubuntu-20.04' if: contains(matrix.os, 'ubuntu') && matrix.os != 'ubuntu-22.04'
run: | run: |
make -j$(nproc) checkcfg make -j$(nproc) checkcfg
- name: Run cfg tests (strict) - name: Run cfg tests (strict)
if: matrix.os == 'ubuntu-20.04' if: matrix.os == 'ubuntu-22.04'
run: | run: |
make -j$(nproc) checkcfg make -j$(nproc) checkcfg
env: env:
@ -238,26 +244,26 @@ jobs:
qcollectiongenerator online-help.qhcp -o online-help.qhc qcollectiongenerator online-help.qhcp -o online-help.qhc
- name: Generate Qt help file on ubuntu 20.04 - name: Generate Qt help file on ubuntu 20.04
if: matrix.os == 'ubuntu-20.04' if: matrix.os == 'ubuntu-22.04'
run: | run: |
pushd gui/help pushd gui/help
qhelpgenerator online-help.qhcp -o online-help.qhc qhelpgenerator online-help.qhcp -o online-help.qhc
- name: Build triage on ubuntu - name: Build triage on ubuntu
if: matrix.os == 'ubuntu-20.04' if: matrix.os == 'ubuntu-22.04'
run: | run: |
pushd tools/triage pushd tools/triage
qmake CONFIG+=debug qmake CONFIG+=debug
make -j$(nproc) make -j$(nproc)
- name: Build Fuzzer - name: Build Fuzzer
if: matrix.os == 'ubuntu-20.04' if: matrix.os == 'ubuntu-22.04'
run: | run: |
pushd oss-fuzz pushd oss-fuzz
make -j$(nproc) CXX=clang++ CXXFLAGS="-fsanitize=address" fuzz-client translate make -j$(nproc) CXX=clang++ CXXFLAGS="-fsanitize=address" fuzz-client translate
- name: Self check (build) - name: Self check (build)
if: matrix.os == 'ubuntu-20.04' if: matrix.os == 'ubuntu-22.04'
run: | run: |
# compile with verification and ast matchers # compile with verification and ast matchers
make clean make clean
@ -265,7 +271,7 @@ jobs:
# Run self check after "Build GUI" to include generated headers in analysis # Run self check after "Build GUI" to include generated headers in analysis
- name: Self check - name: Self check
if: matrix.os == 'ubuntu-20.04' if: matrix.os == 'ubuntu-22.04'
run: | run: |
ec=0 ec=0
# self check lib/cli # self check lib/cli

View File

@ -7,7 +7,7 @@ on: [push, pull_request]
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
container: container:
image: "ubuntu:22.04" image: "ubuntu:22.04"

View File

@ -4,7 +4,7 @@ on: [push, pull_request]
jobs: jobs:
convert_via_pandoc: convert_via_pandoc:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View File

@ -7,7 +7,7 @@ on: [push, pull_request]
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
container: container:
image: "ubuntu:22.04" image: "ubuntu:22.04"

View File

@ -5,7 +5,7 @@ on: [push, pull_request]
jobs: jobs:
analyze: analyze:
name: Analyze name: Analyze
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false

View File

@ -7,7 +7,7 @@ on: [push, pull_request]
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View File

@ -7,7 +7,7 @@ on: [push, pull_request]
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View File

@ -7,7 +7,7 @@ on: workflow_dispatch
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
container: container:
image: "kalilinux/kali-rolling" image: "kalilinux/kali-rolling"

View File

@ -7,6 +7,7 @@ on: [push, pull_request]
jobs: jobs:
build: build:
# 'ubuntu-22.04' removes Python 2.7, 3.6 and 3.6 so keep the previous LTS version
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
@ -26,6 +27,7 @@ jobs:
scriptcheck: scriptcheck:
needs: build needs: build
# 'ubuntu-22.04' removes Python 2.7, 3.5 and 3.6 so keep the previous LTS version
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:

View File

@ -7,7 +7,7 @@ on: [push, pull_request]
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
env: env:
QT_VERSION: 5.15.2 QT_VERSION: 5.15.2

View File

@ -7,7 +7,7 @@ on: [push, pull_request]
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
container: container:
image: "ubuntu:22.04" image: "ubuntu:22.04"

View File

@ -8,7 +8,7 @@ on: workflow_dispatch
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2