diff options
| -rw-r--r-- | .github/workflows/nx-libs.yml | 50 |
1 files changed, 11 insertions, 39 deletions
diff --git a/.github/workflows/nx-libs.yml b/.github/workflows/nx-libs.yml index 88b1f5e2b..e2ec3b31f 100644 --- a/.github/workflows/nx-libs.yml +++ b/.github/workflows/nx-libs.yml @@ -9,24 +9,24 @@ on: jobs: build: name: Build on ${{ matrix.cfg.container }} - ${{ matrix.cfg.cc-version }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: ${{ matrix.cfg.container }} strategy: fail-fast: false matrix: cfg: - - { container: 'ubuntu:16.04', cc-version: gcc } - - { container: 'ubuntu:16.04', cc-version: clang } - { container: 'ubuntu:20.04', cc-version: gcc } - { container: 'ubuntu:20.04', cc-version: clang } - { container: 'ubuntu:22.04', cc-version: gcc } - { container: 'ubuntu:22.04', cc-version: clang } + - { container: 'ubuntu:24.04', cc-version: gcc } + - { container: 'ubuntu:24.04', cc-version: clang } - { container: 'debian:stable', cc-version: gcc } - { container: 'debian:stable', cc-version: clang } - { container: 'debian:sid', cc-version: gcc } - { container: 'debian:sid', cc-version: clang } - - { container: 'quay.io/centos/centos:7', cc-version: gcc } - - { container: 'quay.io/centos/centos:7', cc-version: clang } + - { container: 'quay.io/rockylinux/rockylinux:8', cc-version: gcc } + - { container: 'quay.io/rockylinux/rockylinux:8', cc-version: clang } - { container: 'quay.io/centos/centos:stream9', cc-version: gcc } - { container: 'quay.io/centos/centos:stream9', cc-version: clang } - { container: 'fedora:latest', cc-version: gcc } @@ -58,16 +58,9 @@ jobs: dnf -y install ${{ matrix.cfg.cc-version }} ${{ matrix.cfg.cc-version }} --version ;; - */centos:7) - cat /etc/centos-release - rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 - yum -y update - yum -y install ${{ matrix.cfg.cc-version }} - ${{ matrix.cfg.cc-version }} --version - ;; - */centos:stream8) - cat /etc/centos-release - rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + */rockylinux:8) + cat /etc/rocky-release + rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial dnf -y update --nobest --allowerasing dnf -y install ${{ matrix.cfg.cc-version }} ${{ matrix.cfg.cc-version }} --version @@ -121,28 +114,7 @@ jobs: dnf -y install \ quilt xkbcomp-devel ;; - */centos:7) - # enable epel repository for quilt - yum -y install epel-release - rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 - # basic packages - yum -y install \ - autoconf automake gcc-c++ libtool make imake pkgconfig which - # imake deps - yum -y install \ - xorg-x11-proto-devel zlib-devel - # X11 libraries deps - yum -y install \ - libjpeg-devel expat-devel libpng-devel libxml2-devel pixman-devel \ - libX11-devel libXext-devel libXpm-devel libXfont-devel \ - libXdmcp-devel libXdamage-devel libXcomposite-devel \ - libXrandr-devel libXfixes-devel libXtst-devel libXinerama-devel \ - xorg-x11-font-utils libtirpc-devel xkeyboard-config - # soft requirements - yum -y --enablerepo=epel install \ - quilt xorg-x11-xkb-utils-devel - ;; - */centos:stream8) + */rockylinux:8) # Enable powertools repository for imake dnf -y install dnf-plugins-core epel-release rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -189,7 +161,7 @@ jobs: esac - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Build nx-libs with ${{ matrix.cfg.cc-version }} shell: sh @@ -207,7 +179,7 @@ jobs: ;; esac case "${{ matrix.cfg.container }}" in - fedora*|*/centos*|debian*|ubuntu*) + fedora*|*/centos*|*/rockylinux*|debian*|ubuntu*) export IMAKE_DEFINES="-DUseTIRPC=YES" make VERBOSE=1 IMAKE_DEFINES="${IMAKE_DEFINES}" ;; |