Skip to content

Commit af1ca20

Browse files
AenBleiddAenBleidd
committed
Merge pull request #6251 from BOINC/vko_add_fedora_42
[ci][linux] add fedora 42 to the build pipeline
1 parent ccc8da7 commit af1ca20

File tree

5 files changed

+38
-21
lines changed

5 files changed

+38
-21
lines changed

‎.github/workflows/linux-package-stable-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
image: fedora:38
9797
strategy:
9898
matrix:
99-
os: [fc37, fc38, fc39, fc40, fc41, suse15_4, suse15_5, suse15_6]
99+
os: [fc37, fc38, fc39, fc40, fc41, fc42, suse15_4, suse15_5, suse15_6]
100100
fail-fast: false
101101
env:
102102
ARCH: x86_64

‎.github/workflows/linux-package.yml‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ jobs:
239239
needs: prepare-binaries
240240
strategy:
241241
matrix:
242-
os: [fc37, fc38, fc39, fc40, fc41, suse15_4, suse15_5, suse15_6]
242+
os: [fc37, fc38, fc39, fc40, fc41, fc42, suse15_4, suse15_5, suse15_6]
243243
type: [client, manager]
244244
fail-fast: false
245245
env:
@@ -337,7 +337,7 @@ jobs:
337337
BOINCDIR=/var/lib/boinc
338338
339339
case ${{ matrix.os }} in
340-
"fc37" | "fc38" | "fc39" | "fc40" | "fc41")
340+
"fc37" | "fc38" | "fc39" | "fc40" | "fc41" | "fc42")
341341
CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"
342342
;;
343343
"suse15_4" | "suse15_5" | "suse15_6")
@@ -763,7 +763,7 @@ jobs:
763763
needs: build-rpm-package
764764
strategy:
765765
matrix:
766-
os: [37, 38, 39, 40, 41]
766+
os: [37, 38, 39, 40, 41, 42]
767767
type: [install, upgrade, upgrade-from-alpha, upgrade-from-stable]
768768
fail-fast: false
769769
steps:
@@ -781,24 +781,42 @@ jobs:
781781
run: |
782782
dnf install -y boinc-client boinc-manager
783783
784-
- name: Install distro package for further upgrade from the alpha
785-
if: success() && matrix.type == 'upgrade-from-alpha' && matrix.os != '41'
784+
- name: Install distro package for further upgrade from the alpha for Fedora < 41
785+
if: success() && matrix.type == 'upgrade-from-alpha' && matrix.os != '41' && matrix.os != '42'
786786
run: |
787787
dnf install -y dnf-plugins-core
788788
dnf config-manager --add-repo https://boinc.berkeley.edu/dl/linux/alpha/fc${{ matrix.os }}
789789
dnf config-manager --set-enabled boinc.berkeley.edu_dl_linux_alpha_fc${{ matrix.os }}
790790
rpm --import https://boinc.berkeley.edu/dl/linux/alpha/fc${{ matrix.os }}/boinc.gpg
791791
yum install -y boinc-client boinc-manager
792792
793-
- name: Install distro package for further upgrade from the stable
794-
if: success() && matrix.type == 'upgrade-from-stable' && matrix.os != '41'
793+
# - name: Install distro package for further upgrade from the alpha for Fedora >= 41
794+
# if: success() && matrix.type == 'upgrade-from-alpha' && (matrix.os == '41' || matrix.os == '42')
795+
# run: |
796+
# dnf install -y dnf-plugins-core
797+
# dnf config-manager addrepo --from-repofile=https://boinc.berkeley.edu/dl/linux/alpha/fc${{ matrix.os }}/boinc-alpha-fc${{ matrix.os }}.repo
798+
# dnf config-manager setopt boinc.berkeley.edu_dl_linux_alpha_fc${{ matrix.os }}.enabled=1
799+
# rpm --import https://boinc.berkeley.edu/dl/linux/alpha/fc${{ matrix.os }}/boinc.gpg
800+
# yum install -y boinc-client boinc-manager
801+
802+
- name: Install distro package for further upgrade from the stable for Fedora < 41
803+
if: success() && matrix.type == 'upgrade-from-stable' && matrix.os != '41' && matrix.os != '42'
795804
run: |
796805
dnf install -y dnf-plugins-core
797806
dnf config-manager --add-repo https://boinc.berkeley.edu/dl/linux/stable/fc${{ matrix.os }}
798807
dnf config-manager --set-enabled boinc.berkeley.edu_dl_linux_stable_fc${{ matrix.os }}
799808
rpm --import https://boinc.berkeley.edu/dl/linux/stable/fc${{ matrix.os }}/boinc.gpg
800809
yum install -y boinc-client boinc-manager
801810
811+
# - name: Install distro package for further upgrade from the stable for Fedora > 41
812+
# if: success() && matrix.type == 'upgrade-from-stable' && (matrix.os == '41' || matrix.os == '42')
813+
# run: |
814+
# dnf install -y dnf-plugins-core
815+
# dnf config-manager addrepo --from-repofile=https://boinc.berkeley.edu/dl/linux/stable/fc${{ matrix.os }}/boinc-stable-fc${{ matrix.os }}.repo
816+
# dnf config-manager setopt boinc.berkeley.edu_dl_linux_stable_fc${{ matrix.os }}.enabled=1
817+
# rpm --import https://boinc.berkeley.edu/dl/linux/stable/fc${{ matrix.os }}/boinc.gpg
818+
# yum install -y boinc-client boinc-manager
819+
802820
- name: Download client
803821
if: success()
804822
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
@@ -812,13 +830,13 @@ jobs:
812830
name: linux-package_manager_fc${{ matrix.os }}_${{ github.event.pull_request.head.sha }}
813831

814832
- name: Install client and manager for Fedora < 41
815-
if: success() && matrix.os != '41'
833+
if: success() && matrix.os != '41' && matrix.os != '42'
816834
run: |
817835
yum localinstall -y --allowerasing $(find ./ -type f -name "boinc-client*.rpm" -printf "%p\n")
818836
yum localinstall -y --allowerasing $(find ./ -type f -name "boinc-manager*.rpm" -printf "%p\n")
819837
820838
- name: Install client and manager for Fedora >= 41
821-
if: success() && matrix.os == '41'
839+
if: success() && (matrix.os == '41' || matrix.os == '42')
822840
run: |
823841
dnf5 install -y --allowerasing $(find ./ -type f -name "boinc-client*.rpm" -printf "%p\n")
824842
dnf5 install -y --allowerasing $(find ./ -type f -name "boinc-manager*.rpm" -printf "%p\n")
@@ -991,7 +1009,7 @@ jobs:
9911009
needs: [test-fedora-rpm-package, test-opensuse-rpm-package]
9921010
strategy:
9931011
matrix:
994-
os: [fc37, fc38, fc39, fc40, fc41, suse15_4, suse15_5, suse15_6]
1012+
os: [fc37, fc38, fc39, fc40, fc41, fc42, suse15_4, suse15_5, suse15_6]
9951013
fail-fast: false
9961014
env:
9971015
ARCH: x86_64

‎.github/workflows/rpmrepo/package_depends.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

33
# This file is part of BOINC.
4-
# http://boinc.berkeley.edu
5-
# Copyright (C) 2024 University of California
4+
# https://boinc.berkeley.edu
5+
# Copyright (C) 2025 University of California
66
#
77
# BOINC is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU Lesser General Public License
@@ -25,7 +25,7 @@ function exit_usage() {
2525

2626
case "$1_$2" in
2727
# fedora distros
28-
"fc37_linux_client" | "fc38_linux_client" | "fc39_linux_client" | "fc40_linux_client" | "fc41_linux_client")
28+
"fc37_linux_client" | "fc38_linux_client" | "fc39_linux_client" | "fc40_linux_client" | "fc41_linux_client" | "fc42_linux_client")
2929
echo "glibc,libXScrnSaver >= 1.2.3,ca-certificates"
3030
;;
3131
# opensuse distros

‎.github/workflows/rpmrepo/package_filelist.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

33
# This file is part of BOINC.
4-
# http://boinc.berkeley.edu
5-
# Copyright (C) 2024 University of California
4+
# https://boinc.berkeley.edu
5+
# Copyright (C) 2025 University of California
66
#
77
# BOINC is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU Lesser General Public License
@@ -18,7 +18,7 @@
1818
# along with BOINC. If not, see <http://www.gnu.org/licenses/>.
1919

2020
case "$1_$2" in
21-
"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")
21+
"fc37_linux_client" | "fc38_linux_client" | "fc39_linux_client" | "fc40_linux_client" | "fc41_linux_client" | "fc42_linux_client" | "suse15_4_linux_client" | "suse15_5_linux_client" | "suse15_6_linux_client")
2222
echo """/etc/default/*
2323
/etc/init.d/*
2424
/etc/bash_completion.d/*
@@ -31,7 +31,7 @@ case "$1_$2" in
3131
"""
3232
;;
3333

34-
"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")
34+
"fc37_linux_manager" | "fc38_linux_manager" | "fc39_linux_manager" | "fc40_linux_manager" | "fc41_linux_manager" | "fc42_linux_manager" | "suse15_4_linux_manager" | "suse15_5_linux_manager" | "suse15_6_linux_manager")
3535
echo """/usr/local/bin/*
3636
/usr/local/share/applications/*
3737
/usr/local/share/boinc-manager/*

‎.github/workflows/rpmrepo/repo_update.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

33
# This file is part of BOINC.
4-
# http://boinc.berkeley.edu
5-
# Copyright (C) 2024 University of California
4+
# https://boinc.berkeley.edu
5+
# Copyright (C) 2025 University of California
66
#
77
# BOINC is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU Lesser General Public License
@@ -100,7 +100,6 @@ echo """#
100100
[boinc-$TYPE-$DISTRO]
101101
name = BOINC $TYPE $DISTRO repository
102102
baseurl = $BASEREPO/$TYPE/$DISTRO
103-
arch = $ARCH
104103
priority = 100
105104
enabled = 1
106105
gpgcheck = 1

0 commit comments

Comments
 (0)