Skip to content

Commit b636abd

Browse files
authored
Merge pull request #6995 from BOINC/vko_add_ubuntu_26.04_and_fedora_44_linux_packages
[ci][linux] Add Fedora 44 and Ubuntu 26.04 packages, enable some previously disabled tests
2 parents bf1acac + 4ed566b commit b636abd

7 files changed

Lines changed: 59 additions & 35 deletions

File tree

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"rootDir": "http-data/resolute",
3+
"downloadConcurrency": 4,
4+
"downloadSpeedLimit": 0,
5+
"architectures": [],
6+
"dependencyFollowSuggests": false,
7+
"dependencyFollowRecommends": false,
8+
"dependencyFollowAllVariants": false,
9+
"dependencyFollowSource": false,
10+
"dependencyVerboseResolve": false,
11+
"gpgDisableSign": false,
12+
"gpgDisableVerify": false,
13+
"gpgProvider": "gpg2",
14+
"downloadSourcePackages": false,
15+
"skipLegacyPool": true,
16+
"ppaDistributorID": "ubuntu",
17+
"ppaCodename": "",
18+
"FileSystemPublishEndpoints": {},
19+
"S3PublishEndpoints": {},
20+
"SwiftPublishEndpoints": {},
21+
"enableMetricsEndpoint": false,
22+
"logLevel": "info",
23+
"logFormat": "default",
24+
"serveInAPIMode": false
25+
}

.github/workflows/debrepo/package_depends.sh

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

33
# This file is part of BOINC.
4-
# http://boinc.berkeley.edu
4+
# https://boinc.berkeley.edu
55
# Copyright (C) 2026 University of California
66
#
77
# BOINC is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@ function exit_usage() {
2727
}
2828

2929
case "$1_$2" in
30-
"focal_linux_client" | "jammy_linux_client" | "noble_linux_client" | "buster_linux_client" | "bullseye_linux_client" | "bookworm_linux_client" | "trixie_linux_client")
30+
"focal_linux_client" | "jammy_linux_client" | "noble_linux_client" | "resolute_linux_client" | "buster_linux_client" | "bullseye_linux_client" | "bookworm_linux_client" | "trixie_linux_client")
3131
echo "libc6,libxss1 (>= 1.2.3),ca-certificates,libatomic1"
3232
;;
3333
*) echo "libc6"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is part of BOINC.
22
# https://boinc.berkeley.edu
3-
# Copyright (C) 2025 University of California
3+
# Copyright (C) 2026 University of California
44
#
55
# BOINC is free software; you can redistribute it and/or modify it
66
# under the terms of the GNU Lesser General Public License
@@ -38,7 +38,7 @@ jobs:
3838
runs-on: ubuntu-latest
3939
strategy:
4040
matrix:
41-
os: [focal, jammy, noble, buster, bullseye, bookworm, trixie]
41+
os: [focal, jammy, noble, resolute, buster, bullseye, bookworm, trixie]
4242
fail-fast: false
4343
steps:
4444
- name: Check if build is running from origin repo
@@ -97,7 +97,7 @@ jobs:
9797
image: fedora:38
9898
strategy:
9999
matrix:
100-
os: [fc37, fc38, fc39, fc40, fc41, fc42, fc43, suse15_4, suse15_5, suse15_6, suse16_0]
100+
os: [fc37, fc38, fc39, fc40, fc41, fc42, fc43, fc44, suse15_4, suse15_5, suse15_6, suse16_0]
101101
fail-fast: false
102102
env:
103103
PUBKEY_HASH: D4460B4F0EEDE2C0662092F640254C9B29853EA6

.github/workflows/linux-package.yml

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ jobs:
185185
needs: prepare-binaries
186186
strategy:
187187
matrix:
188-
os: [focal, jammy, noble, buster, bullseye, bookworm, trixie]
188+
os: [focal, jammy, noble, resolute, buster, bullseye, bookworm, trixie]
189189
type: [client, manager]
190190
arch: [arm64, amd64, armhf]
191191
fail-fast: false
@@ -258,20 +258,12 @@ jobs:
258258
cat "${{ github.workspace }}/${PKG_FULL}/DEBIAN/control"
259259
echo "------------------------"
260260
261-
- name: Create Ubuntu Package
262-
if: ${{ success() && ( matrix.os == 'focal' || matrix.os == 'jammy' || matrix.os == 'noble' ) }}
261+
- name: Create Package
262+
if: success()
263263
run: |
264264
cd ${{ github.workspace }}/
265-
# Build the actual package for Ubuntu with XZ compression
266265
fakeroot dpkg-deb -Zxz --build "${{ github.workspace }}/${PKG_FULL}"
267266
268-
- name: Create Debian Package
269-
if: ${{ success() && ( matrix.os == 'buster' || matrix.os == 'bullseye' || matrix.os == 'bookworm' || matrix.os == 'trixie' ) }}
270-
run: |
271-
cd ${{ github.workspace }}/
272-
# Build the actual package for Debian with GZIP compression
273-
fakeroot dpkg-deb -Zgzip --build "${{ github.workspace }}/${PKG_FULL}"
274-
275267
- name: Get info from generated package
276268
if: success()
277269
run: |
@@ -293,7 +285,7 @@ jobs:
293285
needs: prepare-binaries
294286
strategy:
295287
matrix:
296-
os: [fc37, fc38, fc39, fc40, fc41, fc42, fc43, suse15_4, suse15_5, suse15_6, suse16_0]
288+
os: [fc37, fc38, fc39, fc40, fc41, fc42, fc43, fc44, suse15_4, suse15_5, suse15_6, suse16_0]
297289
type: [client, manager]
298290
arch: [arm64, amd64, armhf]
299291
fail-fast: false
@@ -407,6 +399,9 @@ jobs:
407399
"fc37" | "fc38" | "fc39" | "fc40" | "fc41" | "fc42" | "fc43")
408400
CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"
409401
;;
402+
"fc44")
403+
CA_BUNDLE="/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"
404+
;;
410405
"suse15_4" | "suse15_5" | "suse15_6" | "suse16_0")
411406
CA_BUNDLE="/etc/ssl/ca-bundle.pem"
412407
;;
@@ -547,7 +542,9 @@ jobs:
547542
ln -s ${BOINCDIR}/remote_hosts.cfg /etc/boinc-client/remote_hosts.cfg
548543
fi
549544
if [ ! -e ${BOINCDIR}/ca-bundle.crt ] ; then
550-
ln -s ${CA_BUNDLE} ${BOINCDIR}/ca-bundle.crt
545+
if [ -e ${CA_BUNDLE} ] ; then
546+
ln -s ${CA_BUNDLE} ${BOINCDIR}/ca-bundle.crt
547+
fi
551548
fi
552549
set_perm_recursive ${BOINCDIR} ${BOINCUSER} ${BOINCGROUP} u+rw,g+rw,o+r-w
553550
set_perm ${BOINCDIR} ${BOINCUSER} ${BOINCGROUP} 0775
@@ -774,7 +771,7 @@ jobs:
774771
needs: build-deb-package
775772
strategy:
776773
matrix:
777-
os: [focal, jammy, noble]
774+
os: [focal, jammy, noble, resolute]
778775
type: [install, upgrade, upgrade-from-ppa, upgrade-from-alpha, upgrade-from-stable]
779776
arch: [amd64, arm64, armhf]
780777
include:
@@ -816,7 +813,7 @@ jobs:
816813
DEBIAN_FRONTEND=noninteractive apt install -y boinc-client boinc-manager
817814
818815
- name: Install distro package for further upgrade from the alpha
819-
if: success() && matrix.type == 'upgrade-from-alpha'
816+
if: success() && matrix.type == 'upgrade-from-alpha' && matrix.os != 'resolute'
820817
run: |
821818
mkdir -p /etc/apt/keyrings
822819
curl -fsSL https://boinc.berkeley.edu/dl/linux/alpha/${{ matrix.os }}/boinc.gpg | gpg --dearmor -o /etc/apt/keyrings/boinc.gpg
@@ -825,7 +822,7 @@ jobs:
825822
DEBIAN_FRONTEND=noninteractive apt install -y boinc-client boinc-manager
826823
827824
- name: Install distro package for further upgrade from the stable
828-
if: success() && matrix.type == 'upgrade-from-stable'
825+
if: success() && matrix.type == 'upgrade-from-stable' && matrix.os != 'resolute'
829826
run: |
830827
mkdir -p /etc/apt/keyrings
831828
curl -fsSL https://boinc.berkeley.edu/dl/linux/stable/${{ matrix.os }}/boinc.gpg | gpg --dearmor -o /etc/apt/keyrings/boinc.gpg
@@ -870,7 +867,7 @@ jobs:
870867
needs: build-rpm-package
871868
strategy:
872869
matrix:
873-
os: [37, 38, 39, 40, 41, 42, 43]
870+
os: [37, 38, 39, 40, 41, 42, 43, 44]
874871
type: [install, upgrade, upgrade-from-alpha, upgrade-from-stable]
875872
arch: [amd64, arm64]
876873
include:
@@ -895,7 +892,7 @@ jobs:
895892
dnf install -y boinc-client boinc-manager
896893
897894
- name: Install distro package for further upgrade from the alpha for Fedora < 41
898-
if: success() && matrix.type == 'upgrade-from-alpha' && matrix.os != '41' && matrix.os != '42' && matrix.os != '43'
895+
if: success() && matrix.type == 'upgrade-from-alpha' && matrix.os != '41' && matrix.os != '42' && matrix.os != '43' && matrix.os != '44'
899896
run: |
900897
dnf install -y dnf-plugins-core
901898
dnf config-manager --add-repo https://boinc.berkeley.edu/dl/linux/alpha/fc${{ matrix.os }}
@@ -904,7 +901,7 @@ jobs:
904901
yum install -y boinc-client boinc-manager
905902
906903
- name: Install distro package for further upgrade from the alpha for Fedora >= 41
907-
if: success() && matrix.type == 'upgrade-from-alpha' && (matrix.os == '41' || matrix.os == '42')
904+
if: success() && matrix.type == 'upgrade-from-alpha' && (matrix.os == '41' || matrix.os == '42' || matrix.os == '43')
908905
run: |
909906
dnf install -y dnf-plugins-core
910907
dnf config-manager addrepo --from-repofile=https://boinc.berkeley.edu/dl/linux/alpha/fc${{ matrix.os }}/boinc-alpha-fc${{ matrix.os }}.repo
@@ -915,7 +912,7 @@ jobs:
915912
dnf install -y boinc-client-${client_version} boinc-manager-${manager_version}
916913
917914
- name: Install distro package for further upgrade from the stable for Fedora < 41
918-
if: success() && matrix.type == 'upgrade-from-stable' && matrix.os != '41' && matrix.os != '42' && matrix.os != '43'
915+
if: success() && matrix.type == 'upgrade-from-stable' && matrix.os != '41' && matrix.os != '42' && matrix.os != '43' && matrix.os != '44'
919916
run: |
920917
dnf install -y dnf-plugins-core
921918
dnf config-manager --add-repo https://boinc.berkeley.edu/dl/linux/stable/fc${{ matrix.os }}
@@ -924,7 +921,7 @@ jobs:
924921
yum install -y boinc-client boinc-manager
925922
926923
- name: Install distro package for further upgrade from the stable for Fedora > 41
927-
if: success() && matrix.type == 'upgrade-from-stable' && (matrix.os == '41' || matrix.os == '42')
924+
if: success() && matrix.type == 'upgrade-from-stable' && (matrix.os == '41' || matrix.os == '42' || matrix.os == '43')
928925
run: |
929926
dnf install -y dnf-plugins-core
930927
dnf config-manager addrepo --from-repofile=https://boinc.berkeley.edu/dl/linux/stable/fc${{ matrix.os }}/boinc-stable-fc${{ matrix.os }}.repo
@@ -947,13 +944,13 @@ jobs:
947944
name: linux-package_manager_${{ matrix.arch }}_fc${{ matrix.os }}_${{ github.event.pull_request.head.sha }}
948945

949946
- name: Install client and manager for Fedora < 41
950-
if: success() && matrix.os != '41' && matrix.os != '42' && matrix.os != '43'
947+
if: success() && matrix.os != '41' && matrix.os != '42' && matrix.os != '43' && matrix.os != '44'
951948
run: |
952949
yum localinstall -y --allowerasing $(find ./ -type f -name "boinc-client*.rpm" -printf "%p\n")
953950
yum localinstall -y --allowerasing $(find ./ -type f -name "boinc-manager*.rpm" -printf "%p\n")
954951
955952
- name: Install client and manager for Fedora >= 41
956-
if: success() && (matrix.os == '41' || matrix.os == '42' || matrix.os == '43')
953+
if: success() && (matrix.os == '41' || matrix.os == '42' || matrix.os == '43' || matrix.os == '44')
957954
run: |
958955
dnf5 install -y --allowerasing $(find ./ -type f -name "boinc-client*.rpm" -printf "%p\n")
959956
dnf5 install -y --allowerasing $(find ./ -type f -name "boinc-manager*.rpm" -printf "%p\n")
@@ -1045,7 +1042,7 @@ jobs:
10451042
needs: [test-debian-deb-package, test-ubuntu-deb-package]
10461043
strategy:
10471044
matrix:
1048-
os: [focal, jammy, noble, buster, bullseye, bookworm, trixie]
1045+
os: [focal, jammy, noble, resolute, buster, bullseye, bookworm, trixie]
10491046
fail-fast: false
10501047
steps:
10511048
- name: Check if build is running from origin repo
@@ -1158,7 +1155,7 @@ jobs:
11581155
needs: [test-fedora-rpm-package, test-opensuse-rpm-package]
11591156
strategy:
11601157
matrix:
1161-
os: [fc37, fc38, fc39, fc40, fc41, fc42, fc43, suse15_4, suse15_5, suse15_6, suse16_0]
1158+
os: [fc37, fc38, fc39, fc40, fc41, fc42, fc43, fc44, suse15_4, suse15_5, suse15_6, suse16_0]
11621159
fail-fast: false
11631160
env:
11641161
PUBKEY_HASH: D4460B4F0EEDE2C0662092F640254C9B29853EA6

.github/workflows/rpmrepo/package_depends.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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" | "fc42_linux_client" | "fc43_linux_client")
28+
"fc37_linux_client" | "fc38_linux_client" | "fc39_linux_client" | "fc40_linux_client" | "fc41_linux_client" | "fc42_linux_client" | "fc43_linux_client" | "fc44_linux_client")
2929
echo "glibc,libXScrnSaver >= 1.2.3,ca-certificates,libatomic"
3030
;;
3131
# opensuse distros

.github/workflows/rpmrepo/package_filelist.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# This file is part of BOINC.
44
# https://boinc.berkeley.edu
5-
# Copyright (C) 2025 University of California
5+
# Copyright (C) 2026 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" | "fc42_linux_client" | "fc43_linux_client" | "suse15_4_linux_client" | "suse15_5_linux_client" | "suse15_6_linux_client" | "suse16_0_linux_client")
21+
"fc37_linux_client" | "fc38_linux_client" | "fc39_linux_client" | "fc40_linux_client" | "fc41_linux_client" | "fc42_linux_client" | "fc43_linux_client" | "fc44_linux_client" | "suse15_4_linux_client" | "suse15_5_linux_client" | "suse15_6_linux_client" | "suse16_0_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" | "fc42_linux_manager" | "fc43_linux_manager" | "suse15_4_linux_manager" | "suse15_5_linux_manager" | "suse15_6_linux_manager" | "suse16_0_linux_manager")
34+
"fc37_linux_manager" | "fc38_linux_manager" | "fc39_linux_manager" | "fc40_linux_manager" | "fc41_linux_manager" | "fc42_linux_manager" | "fc43_linux_manager" | "fc44_linux_manager" | "suse15_4_linux_manager" | "suse15_5_linux_manager" | "suse15_6_linux_manager" | "suse16_0_linux_manager")
3535
echo """/usr/local/bin/*
3636
/usr/local/share/applications/*
3737
/usr/local/share/boinc-manager/*

tests/linux_package_integration_tests.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# This file is part of BOINC.
44
# https://boinc.berkeley.edu
5-
# Copyright (C) 2025 University of California
5+
# Copyright (C) 2026 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
@@ -111,6 +111,8 @@ def _get_file_owner(self, filename):
111111
def _get_ca_certificates_file_path(self):
112112
if os.path.exists("/etc/ssl/certs/ca-certificates.crt"):
113113
return "/etc/ssl/certs/ca-certificates.crt"
114+
if os.path.exists("/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"):
115+
return "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"
114116
if os.path.exists("/etc/ssl/ca-bundle.pem"):
115117
return "/etc/ssl/ca-bundle.pem"
116118
return ""

0 commit comments

Comments
 (0)