Skip to content

Commit

Permalink
Merge pull request #5872 from BOINC/vko_add_fedora_41
Browse files Browse the repository at this point in the history
[linux] Add Fedora 41 package
  • Loading branch information
AenBleidd authored Oct 31, 2024
2 parents 7a873b1 + ad35472 commit 3d5a122
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-package-stable-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
image: fedora:38
strategy:
matrix:
os: [fc37, fc38, fc39, fc40, suse15_4, suse15_5, suse15_6]
os: [fc37, fc38, fc39, fc40, fc41, suse15_4, suse15_5, suse15_6]
fail-fast: false
env:
ARCH: x86_64
Expand Down
24 changes: 15 additions & 9 deletions .github/workflows/linux-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ jobs:
needs: prepare-binaries
strategy:
matrix:
os: [fc37, fc38, fc39, fc40, suse15_4, suse15_5, suse15_6]
os: [fc37, fc38, fc39, fc40, fc41, suse15_4, suse15_5, suse15_6]
type: [client, manager]
fail-fast: false
env:
Expand Down Expand Up @@ -337,7 +337,7 @@ jobs:
BOINCDIR=/var/lib/boinc
case ${{ matrix.os }} in
"fc37" | "fc38" | "fc39" | "fc40")
"fc37" | "fc38" | "fc39" | "fc40" | "fc41")
CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"
;;
"suse15_4" | "suse15_5" | "suse15_6")
Expand Down Expand Up @@ -762,7 +762,7 @@ jobs:
needs: build-rpm-package
strategy:
matrix:
os: [37, 38, 39, 40]
os: [37, 38, 39, 40, 41]
type: [install, upgrade, upgrade-from-alpha, upgrade-from-stable]
fail-fast: false
steps:
Expand All @@ -781,7 +781,7 @@ jobs:
dnf install -y boinc-client boinc-manager
- name: Install distro package for further upgrade from the alpha
if: success() && matrix.type == 'upgrade-from-alpha'
if: success() && matrix.type == 'upgrade-from-alpha' && matrix.os != '41'
run: |
dnf install -y dnf-plugins-core
dnf config-manager --add-repo https://boinc.berkeley.edu/dl/linux/alpha/fc${{ matrix.os }}
Expand All @@ -790,7 +790,7 @@ jobs:
yum install -y boinc-client boinc-manager
- name: Install distro package for further upgrade from the stable
if: success() && matrix.type == 'upgrade-from-stable'
if: success() && matrix.type == 'upgrade-from-stable' && matrix.os != '41'
run: |
dnf install -y dnf-plugins-core
dnf config-manager --add-repo https://boinc.berkeley.edu/dl/linux/stable/fc${{ matrix.os }}
Expand All @@ -810,12 +810,18 @@ jobs:
with:
name: linux-package_manager_fc${{ matrix.os }}_${{ github.event.pull_request.head.sha }}

- name: Install client and manager
if: success()
- name: Install client and manager for Fedora < 41
if: success() && matrix.os != '41'
run: |
yum localinstall -y --allowerasing $(find ./ -type f -name "boinc-client*.rpm" -printf "%p\n")
yum localinstall -y --allowerasing $(find ./ -type f -name "boinc-manager*.rpm" -printf "%p\n")
- name: Install client and manager for Fedora >= 41
if: success() && matrix.os == '41'
run: |
dnf5 install -y --allowerasing $(find ./ -type f -name "boinc-client*.rpm" -printf "%p\n")
dnf5 install -y --allowerasing $(find ./ -type f -name "boinc-manager*.rpm" -printf "%p\n")
- name: Run integration tests
if: success()
run: |
Expand Down Expand Up @@ -860,7 +866,7 @@ jobs:
zypper install -y boinc-client boinc-manager
- name: Install distro package for further upgrade from the stable
if: success() && matrix.type == 'upgrade-from-stable' && matrix.os == '15.6'
if: success() && matrix.type == 'upgrade-from-stable'
run: |
rpm --import https://boinc.berkeley.edu/dl/linux/stable/suse${{ env.OS }}/boinc.gpg
zypper --non-interactive --quiet ar -G -f https://boinc.berkeley.edu/dl/linux/stable/suse${{ env.OS }} official-boinc-repo
Expand Down Expand Up @@ -989,7 +995,7 @@ jobs:
needs: [test-fedora-rpm-package, test-opensuse-rpm-package]
strategy:
matrix:
os: [fc37, fc38, fc39, fc40, suse15_4, suse15_5, suse15_6]
os: [fc37, fc38, fc39, fc40, fc41, suse15_4, suse15_5, suse15_6]
fail-fast: false
env:
ARCH: x86_64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rpmrepo/package_depends.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function exit_usage() {

case "$1_$2" in
# fedora distros
"fc37_linux_client" | "fc38_linux_client" | "fc39_linux_client" | "fc40_linux_client")
"fc37_linux_client" | "fc38_linux_client" | "fc39_linux_client" | "fc40_linux_client" | "fc41_linux_client")
echo "glibc,libXScrnSaver >= 1.2.3,ca-certificates"
;;
# opensuse distros
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rpmrepo/package_filelist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# along with BOINC. If not, see <http://www.gnu.org/licenses/>.

case "$1_$2" in
"fc37_linux_client" | "fc38_linux_client" | "fc39_linux_client" | "fc40_linux_client" | "suse15_4_linux_client" | "suse15_5_linux_client" | "suse15_6_linux_client")
"fc37_linux_client" | "fc38_linux_client" | "fc39_linux_client" | "fc40_linux_client" | "fc41_linux_client" | "suse15_4_linux_client" | "suse15_5_linux_client" | "suse15_6_linux_client")
echo """/etc/default/*
/etc/init.d/*
/etc/bash_completion.d/*
Expand All @@ -31,7 +31,7 @@ case "$1_$2" in
"""
;;

"fc37_linux_manager" | "fc38_linux_manager" | "fc39_linux_manager" | "fc40_linux_manager" | "suse15_4_linux_manager" | "suse15_5_linux_manager" | "suse15_6_linux_manager")
"fc37_linux_manager" | "fc38_linux_manager" | "fc39_linux_manager" | "fc40_linux_manager" | "fc41_linux_manager" | "suse15_4_linux_manager" | "suse15_5_linux_manager" | "suse15_6_linux_manager")
echo """/usr/local/bin/*
/usr/local/share/applications/*
/usr/local/share/boinc-manager/*
Expand Down

0 comments on commit 3d5a122

Please sign in to comment.