Skip to content

Commit 605506a

Browse files
committed
[ci][linux] Add Fedora 44 and Ubuntu 26.04 packages, enable some previously disabled tests
Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
1 parent bf1acac commit 605506a

6 files changed

Lines changed: 52 additions & 34 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: 18 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,13 @@ 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 }}/
265265
# Build the actual package for Ubuntu with XZ compression
266266
fakeroot dpkg-deb -Zxz --build "${{ github.workspace }}/${PKG_FULL}"
267267
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-
275268
- name: Get info from generated package
276269
if: success()
277270
run: |
@@ -293,7 +286,7 @@ jobs:
293286
needs: prepare-binaries
294287
strategy:
295288
matrix:
296-
os: [fc37, fc38, fc39, fc40, fc41, fc42, fc43, suse15_4, suse15_5, suse15_6, suse16_0]
289+
os: [fc37, fc38, fc39, fc40, fc41, fc42, fc43, fc44, suse15_4, suse15_5, suse15_6, suse16_0]
297290
type: [client, manager]
298291
arch: [arm64, amd64, armhf]
299292
fail-fast: false
@@ -404,7 +397,7 @@ jobs:
404397
BOINCDIR=/var/lib/boinc
405398
406399
case ${{ matrix.os }} in
407-
"fc37" | "fc38" | "fc39" | "fc40" | "fc41" | "fc42" | "fc43")
400+
"fc37" | "fc38" | "fc39" | "fc40" | "fc41" | "fc42" | "fc43" | "fc44")
408401
CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"
409402
;;
410403
"suse15_4" | "suse15_5" | "suse15_6" | "suse16_0")
@@ -774,7 +767,7 @@ jobs:
774767
needs: build-deb-package
775768
strategy:
776769
matrix:
777-
os: [focal, jammy, noble]
770+
os: [focal, jammy, noble, resolute]
778771
type: [install, upgrade, upgrade-from-ppa, upgrade-from-alpha, upgrade-from-stable]
779772
arch: [amd64, arm64, armhf]
780773
include:
@@ -816,7 +809,7 @@ jobs:
816809
DEBIAN_FRONTEND=noninteractive apt install -y boinc-client boinc-manager
817810
818811
- name: Install distro package for further upgrade from the alpha
819-
if: success() && matrix.type == 'upgrade-from-alpha'
812+
if: success() && matrix.type == 'upgrade-from-alpha' && matrix.os != 'resolute'
820813
run: |
821814
mkdir -p /etc/apt/keyrings
822815
curl -fsSL https://boinc.berkeley.edu/dl/linux/alpha/${{ matrix.os }}/boinc.gpg | gpg --dearmor -o /etc/apt/keyrings/boinc.gpg
@@ -825,7 +818,7 @@ jobs:
825818
DEBIAN_FRONTEND=noninteractive apt install -y boinc-client boinc-manager
826819
827820
- name: Install distro package for further upgrade from the stable
828-
if: success() && matrix.type == 'upgrade-from-stable'
821+
if: success() && matrix.type == 'upgrade-from-stable' && matrix.os != 'resolute'
829822
run: |
830823
mkdir -p /etc/apt/keyrings
831824
curl -fsSL https://boinc.berkeley.edu/dl/linux/stable/${{ matrix.os }}/boinc.gpg | gpg --dearmor -o /etc/apt/keyrings/boinc.gpg
@@ -870,7 +863,7 @@ jobs:
870863
needs: build-rpm-package
871864
strategy:
872865
matrix:
873-
os: [37, 38, 39, 40, 41, 42, 43]
866+
os: [37, 38, 39, 40, 41, 42, 43, 44]
874867
type: [install, upgrade, upgrade-from-alpha, upgrade-from-stable]
875868
arch: [amd64, arm64]
876869
include:
@@ -895,7 +888,7 @@ jobs:
895888
dnf install -y boinc-client boinc-manager
896889
897890
- 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'
891+
if: success() && matrix.type == 'upgrade-from-alpha' && matrix.os != '41' && matrix.os != '42' && matrix.os != '43' && matrix.os != '44'
899892
run: |
900893
dnf install -y dnf-plugins-core
901894
dnf config-manager --add-repo https://boinc.berkeley.edu/dl/linux/alpha/fc${{ matrix.os }}
@@ -904,7 +897,7 @@ jobs:
904897
yum install -y boinc-client boinc-manager
905898
906899
- 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')
900+
if: success() && matrix.type == 'upgrade-from-alpha' && (matrix.os == '41' || matrix.os == '42' || matrix.os == '43')
908901
run: |
909902
dnf install -y dnf-plugins-core
910903
dnf config-manager addrepo --from-repofile=https://boinc.berkeley.edu/dl/linux/alpha/fc${{ matrix.os }}/boinc-alpha-fc${{ matrix.os }}.repo
@@ -915,7 +908,7 @@ jobs:
915908
dnf install -y boinc-client-${client_version} boinc-manager-${manager_version}
916909
917910
- 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'
911+
if: success() && matrix.type == 'upgrade-from-stable' && matrix.os != '41' && matrix.os != '42' && matrix.os != '43' && matrix.os != '44'
919912
run: |
920913
dnf install -y dnf-plugins-core
921914
dnf config-manager --add-repo https://boinc.berkeley.edu/dl/linux/stable/fc${{ matrix.os }}
@@ -924,7 +917,7 @@ jobs:
924917
yum install -y boinc-client boinc-manager
925918
926919
- 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')
920+
if: success() && matrix.type == 'upgrade-from-stable' && (matrix.os == '41' || matrix.os == '42' || matrix.os == '43')
928921
run: |
929922
dnf install -y dnf-plugins-core
930923
dnf config-manager addrepo --from-repofile=https://boinc.berkeley.edu/dl/linux/stable/fc${{ matrix.os }}/boinc-stable-fc${{ matrix.os }}.repo
@@ -947,13 +940,13 @@ jobs:
947940
name: linux-package_manager_${{ matrix.arch }}_fc${{ matrix.os }}_${{ github.event.pull_request.head.sha }}
948941

949942
- name: Install client and manager for Fedora < 41
950-
if: success() && matrix.os != '41' && matrix.os != '42' && matrix.os != '43'
943+
if: success() && matrix.os != '41' && matrix.os != '42' && matrix.os != '43' && matrix.os != '44'
951944
run: |
952945
yum localinstall -y --allowerasing $(find ./ -type f -name "boinc-client*.rpm" -printf "%p\n")
953946
yum localinstall -y --allowerasing $(find ./ -type f -name "boinc-manager*.rpm" -printf "%p\n")
954947
955948
- name: Install client and manager for Fedora >= 41
956-
if: success() && (matrix.os == '41' || matrix.os == '42' || matrix.os == '43')
949+
if: success() && (matrix.os == '41' || matrix.os == '42' || matrix.os == '43' || matrix.os == '44')
957950
run: |
958951
dnf5 install -y --allowerasing $(find ./ -type f -name "boinc-client*.rpm" -printf "%p\n")
959952
dnf5 install -y --allowerasing $(find ./ -type f -name "boinc-manager*.rpm" -printf "%p\n")
@@ -997,7 +990,7 @@ jobs:
997990
998991
# boinc-client package in the official repo is currently broken for openSUSE 16.0 with the error "usermod: group 'render' does not exist"
999992
- name: Install distro package for further upgrade
1000-
if: success() && matrix.type == 'upgrade' && matrix.os != '16.0'
993+
if: success() && matrix.type == 'upgrade' #&& matrix.os != '16.0'
1001994
run: |
1002995
zypper install -y boinc-client boinc-manager
1003996
@@ -1045,7 +1038,7 @@ jobs:
10451038
needs: [test-debian-deb-package, test-ubuntu-deb-package]
10461039
strategy:
10471040
matrix:
1048-
os: [focal, jammy, noble, buster, bullseye, bookworm, trixie]
1041+
os: [focal, jammy, noble, resolute, buster, bullseye, bookworm, trixie]
10491042
fail-fast: false
10501043
steps:
10511044
- name: Check if build is running from origin repo
@@ -1158,7 +1151,7 @@ jobs:
11581151
needs: [test-fedora-rpm-package, test-opensuse-rpm-package]
11591152
strategy:
11601153
matrix:
1161-
os: [fc37, fc38, fc39, fc40, fc41, fc42, fc43, suse15_4, suse15_5, suse15_6, suse16_0]
1154+
os: [fc37, fc38, fc39, fc40, fc41, fc42, fc43, fc44, suse15_4, suse15_5, suse15_6, suse16_0]
11621155
fail-fast: false
11631156
env:
11641157
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/*

0 commit comments

Comments
 (0)