aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2024-11-20 21:50:09 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2024-11-20 21:50:09 +0100
commitb58d6654924415d20d442e39fb30fc71a9e2cd5d (patch)
treec74b6bad72611b03755128d484f6425882cc7ed8
parent9e927a9d8576984ec3a2e7779abf90a27a38291d (diff)
parentb8160eb8337bb549143f48534ccade2813f7ff32 (diff)
downloadnx-libs-b58d6654924415d20d442e39fb30fc71a9e2cd5d.tar.gz
nx-libs-b58d6654924415d20d442e39fb30fc71a9e2cd5d.tar.bz2
nx-libs-b58d6654924415d20d442e39fb30fc71a9e2cd5d.zip
Merge branch 'mjtrangoni-update-workflows' into 3.6.xHEAD3.6.x
Attributes GH PR #1081: https://github.com/ArcticaProject/nx-libs/pull/1081
-rw-r--r--.github/dependabot.yml6
-rw-r--r--.github/workflows/linters.yml22
-rw-r--r--.github/workflows/nx-libs-archs.yml12
-rw-r--r--.github/workflows/nx-libs.yml50
4 files changed, 34 insertions, 56 deletions
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..5ace4600a
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "weekly"
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index f8a670610..32d8c0bf6 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -9,10 +9,10 @@ on:
jobs:
# see https://github.com/koalaman/shellcheck
shellcheck:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
steps:
- name: Checkout repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
- name: Install linters on ubuntu
run: |
@@ -22,22 +22,22 @@ jobs:
- name: run Shellcheck
run: |
shellcheck --version
- find . -name "*.sh" | xargs shellcheck -e SC1004,SC2010,SC2035,SC2086
+ find . -name "*.sh" | xargs shellcheck -e SC1004,SC2010,SC2035,SC2086,SC2268
# see https://pylint.org/
pylint:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
steps:
- name: Checkout repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
- name: Install linters on ubuntu
run: |
sudo apt-get update -q -y
sudo apt-get install pylint
# dependencies
- sudo apt-get install --reinstall python-gi
- sudo apt-get install python-dbus python-gobject
+ sudo apt-get install --reinstall python3-gi
+ sudo apt-get install python3-dbus
- name: run Pylint
run: |
@@ -46,10 +46,10 @@ jobs:
# see https://github.com/danmar/cppcheck
cppcheck:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
steps:
- name: Checkout repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
- name: Install linters on ubuntu
run: |
@@ -72,10 +72,10 @@ jobs:
# see https://www.viva64.com/en/pvs-studio/
pvs:
environment: pvs
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
steps:
- name: Checkout repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
- name: Install linters on ubuntu
env:
diff --git a/.github/workflows/nx-libs-archs.yml b/.github/workflows/nx-libs-archs.yml
index b2e343acd..74936aa12 100644
--- a/.github/workflows/nx-libs-archs.yml
+++ b/.github/workflows/nx-libs-archs.yml
@@ -8,7 +8,7 @@ on:
jobs:
build:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
name: Build on ${{ matrix.distro }} ${{ matrix.arch }} with gcc
# Run steps on a matrix of 4 arch/distro combinations
@@ -17,18 +17,18 @@ jobs:
matrix:
include:
- arch: aarch64
- distro: ubuntu20.04
+ distro: ubuntu22.04
- arch: ppc64le
- distro: ubuntu20.04
+ distro: ubuntu22.04
- arch: s390x
- distro: ubuntu20.04
+ distro: ubuntu22.04
- arch: armv7
- distro: ubuntu20.04
+ distro: ubuntu22.04
steps:
- name: Checkout repository
uses: actions/checkout@v2
- - uses: uraimo/run-on-arch-action@v2.0.8
+ - uses: uraimo/run-on-arch-action@v2.7.2
name: Build artifact
id: build
with:
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}"
;;