Skip to content

Commit d628d98

Browse files
committed
update GitHub Actions to use Rocky Linux 9
also updated rpm builds
1 parent 8ab146b commit d628d98

File tree

6 files changed

+94
-15
lines changed

6 files changed

+94
-15
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 9 Prerequisites
90+
run: contrib/CI/rockylinux9.sh
9191

9292
- name: Configure CMake
9393
run: |

.github/workflows/test.yml

Lines changed: 5 additions & 1 deletion
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 }}
@@ -95,6 +95,10 @@ jobs:
9595
if: matrix.img == 'rockylinux:8'
9696
run: contrib/CI/rockylinux8.sh
9797

98+
- name: Rocky Linux 9 Prerequisites
99+
if: matrix.img == 'rockylinux:9'
100+
run: contrib/CI/rockylinux9.sh
101+
98102
- name: Ubuntu Prerequisites
99103
if: startsWith(matrix.img, 'ubuntu:')
100104
run: contrib/CI/ubuntu.sh

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/rockylinux9.sh

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
#!/usr/bin/env bash
2+
# This file is part of GUFI, which is part of MarFS, which is released
3+
# under the BSD license.
4+
#
5+
#
6+
# Copyright (c) 2017, Los Alamos National Security (LANS), LLC
7+
# All rights reserved.
8+
#
9+
# Redistribution and use in source and binary forms, with or without modification,
10+
# are permitted provided that the following conditions are met:
11+
#
12+
# 1. Redistributions of source code must retain the above copyright notice, this
13+
# list of conditions and the following disclaimer.
14+
#
15+
# 2. Redistributions in binary form must reproduce the above copyright notice,
16+
# this list of conditions and the following disclaimer in the documentation and/or
17+
# other materials provided with the distribution.
18+
#
19+
# 3. Neither the name of the copyright holder nor the names of its contributors
20+
# may be used to endorse or promote products derived from this software without
21+
# specific prior written permission.
22+
#
23+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
24+
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
25+
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
26+
# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
27+
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
28+
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29+
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
30+
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
31+
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
32+
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33+
#
34+
#
35+
# From Los Alamos National Security, LLC:
36+
# LA-CC-15-039
37+
#
38+
# Copyright (c) 2017, Los Alamos National Security, LLC All rights reserved.
39+
# Copyright 2017. Los Alamos National Security, LLC. This software was produced
40+
# under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National
41+
# Laboratory (LANL), which is operated by Los Alamos National Security, LLC for
42+
# the U.S. Department of Energy. The U.S. Government has rights to use,
43+
# reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR LOS
44+
# ALAMOS NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
45+
# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is
46+
# modified to produce derivative works, such modified software should be
47+
# clearly marked, so as not to confuse it with the version available from
48+
# LANL.
49+
#
50+
# THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND CONTRIBUTORS
51+
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
52+
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
53+
# ARE DISCLAIMED. IN NO EVENT SHALL LOS ALAMOS NATIONAL SECURITY, LLC OR
54+
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
55+
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
56+
# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
57+
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
58+
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
59+
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
60+
# OF SUCH DAMAGE.
61+
62+
63+
64+
65+
set -e
66+
67+
# install Extra Packages for Enterprise Linux (EPEL)
68+
dnf -y install epel-release
69+
70+
# install libraries
71+
dnf -y --enablerepo=devel install fuse-devel libattr-devel pcre2-devel zlib-devel
72+
73+
# install required packages
74+
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)