Skip to content

Commit 20afe71

Browse files
committed
add Rocky Linux 9 build to GitHub Actions
update Rocky Linux 8 dependency installer script to be usable with 9 also updated rpm builds
1 parent 8ab146b commit 20afe71

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

.github/workflows/rpm.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
matrix:
7878
client: [ Off, On ]
7979
container:
80-
image: centos:8
80+
image: rockylinux:9
8181
steps:
8282
- uses: actions/checkout@v4
8383

@@ -86,8 +86,8 @@ jobs:
8686
path: ${{ env.DEP_INSTALL_PREFIX }}
8787
key: ${{ runner.os }}-Client-${{ matrix.client }}
8888

89-
- name: CentOS 8 Prerequisites
90-
run: contrib/CI/centos8.sh
89+
- name: Rocky Linux Prerequisites
90+
run: contrib/CI/rockylinux.sh
9191

9292
- name: Configure CMake
9393
run: |

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
runs-on: ubuntu-latest
7676
strategy:
7777
matrix:
78-
img: [ "centos:8", "rockylinux:8", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04" ]
78+
img: [ "centos:8", "rockylinux:8", "rockylinux:9", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04" ]
7979
fail-fast: true
8080
container:
8181
image: ${{ matrix.img }}
@@ -91,9 +91,9 @@ jobs:
9191
if: matrix.img == 'centos:8'
9292
run: contrib/CI/centos8.sh
9393

94-
- name: Rocky Linux 8 Prerequisites
95-
if: matrix.img == 'rockylinux:8'
96-
run: contrib/CI/rockylinux8.sh
94+
- name: Rocky Linux Prerequisites
95+
if: startsWith(matrix.img, 'rockylinux:')
96+
run: contrib/CI/rockylinux.sh
9797

9898
- name: Ubuntu Prerequisites
9999
if: startsWith(matrix.img, 'ubuntu:')

contrib/CI/generic_rpm.sh.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
set -e
6565

6666
# install rpmbuild
67-
yum install -y rpm-build
67+
dnf install -y rpm-build
6868

6969
# reconfigure CMake
7070
cmake @CMAKE_SOURCE_DIR@
@@ -73,7 +73,7 @@ cmake @CMAKE_SOURCE_DIR@
7373
make package
7474

7575
# install the RPM
76-
yum install -y gufi-*.rpm
76+
dnf install -y gufi-*.rpm
7777

7878
# compare the configuration files
7979
@DIFF@ server.example "$(dirname @CONFIG_FILE@)/server.example"

contrib/CI/rockylinux8.sh renamed to contrib/CI/rockylinux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ set -e
6868
dnf -y install epel-release
6969

7070
# install libraries
71-
dnf -y install fuse-devel libattr-devel pcre2-devel zlib-devel
71+
dnf -y --enablerepo=devel install fuse-devel libattr-devel pcre2-devel zlib-devel
7272

7373
# install required packages
7474
dnf -y install attr autoconf clang cmake3 findutils fuse git make patch pkgconfig python3 sudo

contrib/CI/rpms.sh.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
set -e
6565

6666
# install rpmbuild
67-
yum install -y rpm-build
67+
dnf install -y rpm-build
6868

6969
# reconfigure CMake
7070
cmake @CMAKE_SOURCE_DIR@
@@ -73,19 +73,19 @@ cmake @CMAKE_SOURCE_DIR@
7373
make package
7474

7575
# install the RPM
76-
yum install -y gufi-server-*.rpm
76+
dnf install -y gufi-server-*.rpm
7777

7878
# compare the configuration files
7979
@DIFF@ server.example "$(dirname @CONFIG_FILE@)/server.example"
8080

8181
# uninstall GUFI-Server
82-
yum autoremove -y GUFI-Server
82+
dnf autoremove -y GUFI-Server
8383

8484
# upgrade pip to get the latest Python dependencies
8585
@PYTHON_INTERPRETER@ -m pip install --upgrade pip
8686

8787
# install the client RPM
88-
yum install -y gufi-client-*.rpm
88+
dnf install -y gufi-client-*.rpm
8989

9090
# compare the configuration files
9191
@DIFF@ client.example "$(dirname @CONFIG_FILE@)/client.example"

docs/latex/sections/build.tex

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,12 @@ \section{Build}
7676
\\\\
7777
GUFI is known to build on Ubuntu~16.04~(Xenial),
7878
Ubuntu~18.04~(Bionic), Ubuntu~20.04~(Focal), Ubuntu~22.04~(Jammy),
79-
Ubuntu~24.04~(Noble), CentOS~7, CentOS~8, RockyLinux~8,
80-
OSX~10.13~(High~Sierra), OSX~11~(Big~Sur), OSX~12~(Monterey),
81-
OSX~13~(Ventura), and OSX~14~(Sonoma). Building on Windows with
82-
cygwin, GCC (not MinGW), and with jemalloc turned off also
83-
works. OpenSUSE~12.3 was supported in the past, and may still work.
79+
Ubuntu~24.04~(Noble), CentOS~7, CentOS~8, Rocky~Linux~8,
80+
Rocky~Linux~9, OSX~10.13~(High~Sierra), OSX~11~(Big~Sur),
81+
OSX~12~(Monterey), OSX~13~(Ventura), and OSX~14~(Sonoma). Building on
82+
Windows with cygwin, GCC (not MinGW), and with jemalloc turned off
83+
also works. OpenSUSE~12.3 was supported in the past, and may still
84+
work.
8485

8586
\subsection{Environment Variables}
8687
\begin{table}[h!]

0 commit comments

Comments
 (0)