Skip to content

Commit b58d665

Browse files
committed
Merge branch 'mjtrangoni-update-workflows' into 3.6.x
Attributes GH PR #1081: #1081
2 parents 9e927a9 + b8160eb commit b58d665

File tree

4 files changed

+34
-56
lines changed

4 files changed

+34
-56
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

.github/workflows/linters.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ on:
99
jobs:
1010
# see https://github.com/koalaman/shellcheck
1111
shellcheck:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
steps:
1414
- name: Checkout repository
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616

1717
- name: Install linters on ubuntu
1818
run: |
@@ -22,22 +22,22 @@ jobs:
2222
- name: run Shellcheck
2323
run: |
2424
shellcheck --version
25-
find . -name "*.sh" | xargs shellcheck -e SC1004,SC2010,SC2035,SC2086
25+
find . -name "*.sh" | xargs shellcheck -e SC1004,SC2010,SC2035,SC2086,SC2268
2626
2727
# see https://pylint.org/
2828
pylint:
29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-22.04
3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v2
32+
uses: actions/checkout@v4
3333

3434
- name: Install linters on ubuntu
3535
run: |
3636
sudo apt-get update -q -y
3737
sudo apt-get install pylint
3838
# dependencies
39-
sudo apt-get install --reinstall python-gi
40-
sudo apt-get install python-dbus python-gobject
39+
sudo apt-get install --reinstall python3-gi
40+
sudo apt-get install python3-dbus
4141
4242
- name: run Pylint
4343
run: |
@@ -46,10 +46,10 @@ jobs:
4646
4747
# see https://github.com/danmar/cppcheck
4848
cppcheck:
49-
runs-on: ubuntu-20.04
49+
runs-on: ubuntu-22.04
5050
steps:
5151
- name: Checkout repository
52-
uses: actions/checkout@v2
52+
uses: actions/checkout@v4
5353

5454
- name: Install linters on ubuntu
5555
run: |
@@ -72,10 +72,10 @@ jobs:
7272
# see https://www.viva64.com/en/pvs-studio/
7373
pvs:
7474
environment: pvs
75-
runs-on: ubuntu-20.04
75+
runs-on: ubuntu-22.04
7676
steps:
7777
- name: Checkout repository
78-
uses: actions/checkout@v2
78+
uses: actions/checkout@v4
7979

8080
- name: Install linters on ubuntu
8181
env:

.github/workflows/nx-libs-archs.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
name: Build on ${{ matrix.distro }} ${{ matrix.arch }} with gcc
1313

1414
# Run steps on a matrix of 4 arch/distro combinations
@@ -17,18 +17,18 @@ jobs:
1717
matrix:
1818
include:
1919
- arch: aarch64
20-
distro: ubuntu20.04
20+
distro: ubuntu22.04
2121
- arch: ppc64le
22-
distro: ubuntu20.04
22+
distro: ubuntu22.04
2323
- arch: s390x
24-
distro: ubuntu20.04
24+
distro: ubuntu22.04
2525
- arch: armv7
26-
distro: ubuntu20.04
26+
distro: ubuntu22.04
2727

2828
steps:
2929
- name: Checkout repository
3030
uses: actions/checkout@v2
31-
- uses: uraimo/run-on-arch-action@v2.0.8
31+
- uses: uraimo/run-on-arch-action@v2.7.2
3232
name: Build artifact
3333
id: build
3434
with:

.github/workflows/nx-libs.yml

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ on:
99
jobs:
1010
build:
1111
name: Build on ${{ matrix.cfg.container }} - ${{ matrix.cfg.cc-version }}
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
container: ${{ matrix.cfg.container }}
1414
strategy:
1515
fail-fast: false
1616
matrix:
1717
cfg:
18-
- { container: 'ubuntu:16.04', cc-version: gcc }
19-
- { container: 'ubuntu:16.04', cc-version: clang }
2018
- { container: 'ubuntu:20.04', cc-version: gcc }
2119
- { container: 'ubuntu:20.04', cc-version: clang }
2220
- { container: 'ubuntu:22.04', cc-version: gcc }
2321
- { container: 'ubuntu:22.04', cc-version: clang }
22+
- { container: 'ubuntu:24.04', cc-version: gcc }
23+
- { container: 'ubuntu:24.04', cc-version: clang }
2424
- { container: 'debian:stable', cc-version: gcc }
2525
- { container: 'debian:stable', cc-version: clang }
2626
- { container: 'debian:sid', cc-version: gcc }
2727
- { container: 'debian:sid', cc-version: clang }
28-
- { container: 'quay.io/centos/centos:7', cc-version: gcc }
29-
- { container: 'quay.io/centos/centos:7', cc-version: clang }
28+
- { container: 'quay.io/rockylinux/rockylinux:8', cc-version: gcc }
29+
- { container: 'quay.io/rockylinux/rockylinux:8', cc-version: clang }
3030
- { container: 'quay.io/centos/centos:stream9', cc-version: gcc }
3131
- { container: 'quay.io/centos/centos:stream9', cc-version: clang }
3232
- { container: 'fedora:latest', cc-version: gcc }
@@ -58,16 +58,9 @@ jobs:
5858
dnf -y install ${{ matrix.cfg.cc-version }}
5959
${{ matrix.cfg.cc-version }} --version
6060
;;
61-
*/centos:7)
62-
cat /etc/centos-release
63-
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
64-
yum -y update
65-
yum -y install ${{ matrix.cfg.cc-version }}
66-
${{ matrix.cfg.cc-version }} --version
67-
;;
68-
*/centos:stream8)
69-
cat /etc/centos-release
70-
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
61+
*/rockylinux:8)
62+
cat /etc/rocky-release
63+
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
7164
dnf -y update --nobest --allowerasing
7265
dnf -y install ${{ matrix.cfg.cc-version }}
7366
${{ matrix.cfg.cc-version }} --version
@@ -121,28 +114,7 @@ jobs:
121114
dnf -y install \
122115
quilt xkbcomp-devel
123116
;;
124-
*/centos:7)
125-
# enable epel repository for quilt
126-
yum -y install epel-release
127-
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
128-
# basic packages
129-
yum -y install \
130-
autoconf automake gcc-c++ libtool make imake pkgconfig which
131-
# imake deps
132-
yum -y install \
133-
xorg-x11-proto-devel zlib-devel
134-
# X11 libraries deps
135-
yum -y install \
136-
libjpeg-devel expat-devel libpng-devel libxml2-devel pixman-devel \
137-
libX11-devel libXext-devel libXpm-devel libXfont-devel \
138-
libXdmcp-devel libXdamage-devel libXcomposite-devel \
139-
libXrandr-devel libXfixes-devel libXtst-devel libXinerama-devel \
140-
xorg-x11-font-utils libtirpc-devel xkeyboard-config
141-
# soft requirements
142-
yum -y --enablerepo=epel install \
143-
quilt xorg-x11-xkb-utils-devel
144-
;;
145-
*/centos:stream8)
117+
*/rockylinux:8)
146118
# Enable powertools repository for imake
147119
dnf -y install dnf-plugins-core epel-release
148120
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
@@ -189,7 +161,7 @@ jobs:
189161
esac
190162
191163
- name: Checkout repository
192-
uses: actions/checkout@v2
164+
uses: actions/checkout@v4
193165

194166
- name: Build nx-libs with ${{ matrix.cfg.cc-version }}
195167
shell: sh
@@ -207,7 +179,7 @@ jobs:
207179
;;
208180
esac
209181
case "${{ matrix.cfg.container }}" in
210-
fedora*|*/centos*|debian*|ubuntu*)
182+
fedora*|*/centos*|*/rockylinux*|debian*|ubuntu*)
211183
export IMAKE_DEFINES="-DUseTIRPC=YES"
212184
make VERBOSE=1 IMAKE_DEFINES="${IMAKE_DEFINES}"
213185
;;

0 commit comments

Comments
 (0)