dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Minor cleanup

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

40
.github/workflows/build.yml vendored
View File

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