mirror of
https://github.com/ckb-next/ckb-next.git
synced 2026-10-10 12:27:21 -04:00
CI: Remove focal, bump Ubuntu and Arch to Qt6
This commit is contained in:
@@ -2,20 +2,18 @@
|
||||
inputs:
|
||||
archlinux-build-dependencies:
|
||||
default: >-
|
||||
base-devel
|
||||
cmake
|
||||
git
|
||||
libdbusmenu-qt5
|
||||
libpulse
|
||||
libsystemd
|
||||
libxcb
|
||||
make
|
||||
pkgconf
|
||||
qt5-base
|
||||
qt5-tools
|
||||
qt5-x11extras
|
||||
quazip
|
||||
xcb-util-wm
|
||||
zlib
|
||||
libpulse
|
||||
libxcb
|
||||
xcb-util-wm
|
||||
qt6-base
|
||||
quazip-qt6
|
||||
qt6-tools
|
||||
qt6-wayland
|
||||
git
|
||||
|
||||
debian-build-dependencies:
|
||||
default: >-
|
||||
@@ -82,7 +80,7 @@ inputs:
|
||||
default: >-
|
||||
rpm-build
|
||||
|
||||
ubuntu-build-dependencies:
|
||||
ubuntu-qt5-build-dependencies:
|
||||
default: >-
|
||||
cmake
|
||||
git
|
||||
@@ -98,6 +96,21 @@ inputs:
|
||||
qttools5-dev
|
||||
zlib1g-dev
|
||||
|
||||
ubuntu-qt6-build-dependencies:
|
||||
default: >-
|
||||
build-essential
|
||||
cmake
|
||||
qt6-base-dev
|
||||
libudev-dev
|
||||
zlib1g-dev
|
||||
libpulse-dev
|
||||
libquazip1-qt6-dev
|
||||
qt6-tools-dev
|
||||
qt6-wayland-dev
|
||||
libxcb-screensaver0-dev
|
||||
libxcb-ewmh-dev
|
||||
libxcb1-dev
|
||||
|
||||
ubuntu-package-dependencies:
|
||||
default: >-
|
||||
dpkg-dev
|
||||
@@ -145,11 +158,20 @@ runs:
|
||||
${{ matrix.compiler == 'LLVM' && 'clang' || 'gcc gcc-c++' }}
|
||||
if: startsWith(matrix.image, 'fedora:')
|
||||
|
||||
- name: Install Dependencies (Ubuntu)
|
||||
- name: Install Dependencies (Ubuntu Qt5)
|
||||
uses: ./.github/actions/dependencies/install/apt-get
|
||||
with:
|
||||
packages: >-
|
||||
${{ inputs.ubuntu-build-dependencies }}
|
||||
${{ inputs.ubuntu-qt5-build-dependencies }}
|
||||
${{ inputs.ubuntu-package-dependencies }}
|
||||
${{ matrix.compiler == 'LLVM' && 'clang' || 'g++ gcc' }}
|
||||
if: startsWith(matrix.image, 'ubuntu:')
|
||||
if: startsWith(matrix.image, 'ubuntu:') && matrix.image == 'ubuntu:22.04'
|
||||
|
||||
- name: Install Dependencies (Ubuntu Qt6)
|
||||
uses: ./.github/actions/dependencies/install/apt-get
|
||||
with:
|
||||
packages: >-
|
||||
${{ inputs.ubuntu-qt6-build-dependencies }}
|
||||
${{ inputs.ubuntu-package-dependencies }}
|
||||
${{ matrix.compiler == 'LLVM' && 'clang' || 'g++ gcc' }}
|
||||
if: startsWith(matrix.image, 'ubuntu:') && matrix.image != 'ubuntu:22.04'
|
||||
|
||||
@@ -22,8 +22,8 @@ jobs:
|
||||
- 'fedora:37'
|
||||
- 'fedora:38'
|
||||
- 'fedora:rawhide'
|
||||
- 'ubuntu:20.04'
|
||||
- 'ubuntu:22.04'
|
||||
- 'ubuntu:24.04'
|
||||
- 'ubuntu:rolling'
|
||||
build_type:
|
||||
- Debug
|
||||
|
||||
Reference in New Issue
Block a user