Skip to content

Commit d851161

Browse files
committed
Merge branch 'master' of https://github.com/dreibh/socketapi
2 parents a01b94c + 8bbf90e commit d851161

5 files changed

Lines changed: 14 additions & 9 deletions

File tree

.github/workflows/linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
# cxx: g++
5454

5555
# ====== Fedora Linux =============================================
56-
- label: "Fedora 42 with Clang"
57-
image: fedora:42
56+
- label: "Fedora 43 with Clang"
57+
image: fedora:43
5858
cc: clang
5959
cxx: clang++
6060

.github/workflows/multiarch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
# cxx: clang++
6363

6464
# ====== Fedora Linux =============================================
65-
- label: "Fedora 42: GCC/PPC64"
65+
- label: "Fedora 43: GCC/PPC64"
6666
arch: ppc64le
6767
distro: fedora42
6868
cc: gcc

.github/workflows/packaging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
container:
6464
# The GitHub runner issue with Mock seems to be fixed now:
6565
# => https://github.com/rpm-software-management/mock/issues/1487
66-
image: fedora:42
66+
image: fedora:43
6767
options: --privileged --cap-add=SYS_ADMIN
6868
steps:
6969
- uses: actions/checkout@v4

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,13 @@ See [https://www.nntb.no/~dreibh/socketapi/#current-stable-release](https://www.
6565

6666
# 🔗 Useful Links
6767

68-
* [HiPerConTracer – High-Performance Connectivity Tracer](https://www.nntb.no/~dreibh/hipercontracer/)
69-
* [NetPerfMeter – A TCP/MPTCP/UDP/SCTP/DCCP Network Performance Meter Tool](https://www.nntb.no/~dreibh/netperfmeter/)
68+
* [Wireshark](https://www.wireshark.org/)
69+
* [NetPerfMeter – A TCP/MPTCP/UDP/SCTP/DCCP Network Performance Meter Tool](https://www.nntb.no/~dreibh/* [HiPerConTracer – High-Performance Connectivity Tracer](https://www.nntb.no/~dreibh/hipercontracer/)
70+
netperfmeter/)
7071
* [SubNetCalc – An IPv4/IPv6 Subnet Calculator](https://www.nntb.no/~dreibh/subnetcalc/)
7172
* [System-Tools – Tools for Basic System Management](https://www.nntb.no/~dreibh/system-tools/)
7273
* [Virtual Machine Image Builder and System Installation Scripts](https://www.nntb.no/~dreibh/vmimage-builder-scripts/)
73-
* [Wireshark](https://www.wireshark.org/)
74+
* [Thomas Dreibholz's SCTP Page](https://www.nntb.no/~dreibh/sctp/)
75+
* [Thomas Dreibholz's Reliable Server Pooling Page](https://www.nntb.no/~dreibh/rserpool/)
76+
* [Michael Tüxen's SCTP Page](https://www.sctp.de/)
77+
* [NorNet – A Real-World, Large-Scale Multi-Homing Testbed](https://www.nntb.no/)

ci/ci-setup

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ if [ "${ID}" == "ubuntu" ] || [ "${ID}" == "debian" ] ; then
6161
DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-confdef --no-install-recommends \
6262
${PACKAGES}
6363

64+
# ====== Enable PPA ======================================================
65+
# This is only available for Ubuntu:
6466
if [ "${ID}" == "ubuntu" ] ; then
6567
# Add PPA dreibh/ppa for Ubuntu:
6668
DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-confdef --no-install-recommends \
@@ -156,8 +158,7 @@ EOF
156158
if [ "${OS}" == "ubuntu" ] ; then
157159
# Add PPA dreibh/ppa for Ubuntu:
158160
OS="${OS}" DISTRIBUTION="${DIST}" ARCHITECTURE="${ARCH}" pbuilder login --save-after-login <<EOF
159-
DEBIAN_FRONTEND=noninteractive apt-get install -qqy -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-confdef --no-install-recommends \
160-
software-properties-common
161+
DEBIAN_FRONTEND=noninteractive apt-get install -qqy -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-confdef --no-install-recommends gpg-agent software-properties-common
161162
apt-add-repository -y ppa:dreibh/ppa
162163
apt-get update -q
163164
EOF

0 commit comments

Comments
 (0)