CI: Minor cleanup

This commit is contained in:
Jonas Kvinge 2023-02-21 18:43:01 +01:00
parent be67d89d8b
commit 92d77b14d5
1 changed files with 15 additions and 25 deletions

View File

@ -1,4 +1,4 @@
name: build
name: Build
on: [push, pull_request]
jobs:
@ -139,12 +139,12 @@ jobs:
image: fedora:${{matrix.fedora_version}}
steps:
- name: Update repositories
run: yum update --assumeyes
run: dnf update -y
- name: Upgrade packages
run: yum upgrade --assumeyes
run: dnf upgrade -y
- name: Install dependencies
run: >
dnf install --assumeyes
dnf install -y
@development-tools
redhat-lsb-core
which
@ -223,12 +223,12 @@ jobs:
image: openmandriva/${{matrix.openmandriva_version}}
steps:
- name: Update repositories
run: dnf update --assumeyes
run: dnf update -y
- name: Upgrade packages
run: dnf upgrade --assumeyes
run: dnf upgrade -y
- name: Install dependencies
run: >
dnf install --assumeyes
dnf install -y
glibc
gcc-c++
git
@ -310,7 +310,7 @@ jobs:
image: debian:${{matrix.debian_version}}
steps:
- name: Update repositories
run: apt update
run: apt update -y
- name: Install packages
env:
DEBIAN_FRONTEND: noninteractive
@ -353,24 +353,12 @@ jobs:
if: matrix.debian_version == 'buster' || matrix.debian_version == 'bullseye'
env:
DEBIAN_FRONTEND: noninteractive
run: >
apt install -y
qtbase5-dev
qtbase5-dev-tools
qttools5-dev
qttools5-dev-tools
libqt5x11extras5-dev
run: apt install -y qtbase5-dev qtbase5-dev-tools qttools5-dev qttools5-dev-tools libqt5x11extras5-dev
- name: Install Qt 6
if: matrix.debian_version != 'buster' && matrix.debian_version != 'bullseye'
env:
DEBIAN_FRONTEND: noninteractive
run: >
apt install -y
qt6-base-dev
qt6-base-dev-tools
qt6-tools-dev
qt6-tools-dev-tools
qt6-l10n-tools
run: apt install -y qt6-base-dev qt6-base-dev-tools qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools
- uses: actions/checkout@v3
with:
fetch-depth: 0
@ -395,11 +383,13 @@ jobs:
container:
image: ubuntu:${{matrix.ubuntu_version}}
steps:
- name: Update repositories
run: apt update -y
- name: Install packages
env:
DEBIAN_FRONTEND: noninteractive
run: >
apt-get update && apt-get install -y
apt install -y
build-essential
dh-make
ssh
@ -440,12 +430,12 @@ jobs:
if: matrix.ubuntu_version == 'bionic' || matrix.ubuntu_version == 'focal'
env:
DEBIAN_FRONTEND: noninteractive
run: apt-get update && apt-get install -y qtbase5-dev qtbase5-dev-tools qttools5-dev qttools5-dev-tools libqt5x11extras5-dev
run: apt install -y qtbase5-dev qtbase5-dev-tools qttools5-dev qttools5-dev-tools libqt5x11extras5-dev
- name: Install Qt 6
if: matrix.ubuntu_version != 'bionic' && matrix.ubuntu_version != 'focal'
env:
DEBIAN_FRONTEND: noninteractive
run: apt-get update && apt-get install -y qt6-base-dev qt6-base-dev-tools qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools
run: apt install -y qt6-base-dev qt6-base-dev-tools qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools
- uses: actions/checkout@v3
with:
fetch-depth: 0