Skip to content

Commit e8dd2ff

Browse files
Merge branch 'master' into act-removal-5469
2 parents d7cf993 + c7e286e commit e8dd2ff

5 files changed

Lines changed: 33 additions & 15 deletions

File tree

.github/workflows/go.yml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,32 @@ on:
1818
branches:
1919
- '**'
2020

21+
concurrency:
22+
group: ${{ github.workflow }}-${{ github.ref }}
23+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
24+
2125
jobs:
22-
test:
26+
test-linux:
27+
name: Test (Linux)
28+
runs-on: [self-hosted, linux, bee]
29+
steps:
30+
- name: Checkout
31+
uses: actions/checkout@v5
32+
- name: Setup Go
33+
uses: actions/setup-go@v6
34+
with:
35+
cache: true
36+
go-version-file: go.mod
37+
- name: Build
38+
run: make build
39+
- name: Test with race detector
40+
run: make test-ci-race
41+
test-other:
2342
name: Test
2443
runs-on: ${{ matrix.os }}
2544
strategy:
2645
matrix:
27-
os: [ubuntu-latest, macos-latest, windows-latest]
46+
os: [macos-latest, windows-latest]
2847
steps:
2948
- name: Checkout
3049
uses: actions/checkout@v5
@@ -33,19 +52,14 @@ jobs:
3352
with:
3453
cache: true
3554
go-version-file: go.mod
36-
- name: Increase UDP buffer sizes (Ubuntu)
37-
if: matrix.os == 'ubuntu-latest'
38-
run: |
39-
sudo sysctl -w net.core.rmem_max=7500000
40-
sudo sysctl -w net.core.wmem_max=7500000
4155
- name: Increase UDP buffer sizes (macOS)
4256
if: matrix.os == 'macos-latest'
4357
run: |
4458
sudo sysctl -w kern.ipc.maxsockbuf=6291456
4559
- name: Build
4660
run: make build
47-
- name: Test with race detector (Ubuntu and MacOS)
48-
if: matrix.os != 'windows-latest'
61+
- name: Test with race detector (macOS)
62+
if: matrix.os == 'macos-latest'
4963
run: make test-ci-race
5064
- name: Test without race detector (Windows)
5165
if: matrix.os == 'windows-latest'
@@ -110,7 +124,7 @@ jobs:
110124
trigger-beekeeper:
111125
name: Trigger Beekeeper
112126
runs-on: ubuntu-latest
113-
needs: [test, lint, coverage]
127+
needs: [test-linux, test-other, lint, coverage]
114128
if: github.ref == 'refs/heads/master'
115129
steps:
116130
- name: Checkout

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/caddyserver/certmagic v0.21.6
1010
github.com/coreos/go-semver v0.3.0
1111
github.com/ethereum/go-ethereum v1.17.3
12-
github.com/ethersphere/batch-archive v0.0.8
12+
github.com/ethersphere/batch-archive v0.0.9
1313
github.com/ethersphere/go-price-oracle-abi v0.6.9
1414
github.com/ethersphere/go-storage-incentives-abi v0.9.4
1515
github.com/ethersphere/go-sw3-abi v0.6.9

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab/go.mod h1
246246
github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg=
247247
github.com/ethereum/go-ethereum v1.17.3 h1:Ev/sQHH+UdKZHWjuVzhu2pxhi/sXaPZl23Q+Q5LDd4Q=
248248
github.com/ethereum/go-ethereum v1.17.3/go.mod h1:f2EhRwqewIZkGoQekywI2Y2RZAMTSavLNkD9qItFy1A=
249-
github.com/ethersphere/batch-archive v0.0.8 h1:Y6ipqJfcjLbOn+2Rn5tMrOvrMH7pzF0YhliC/jsGRUc=
250-
github.com/ethersphere/batch-archive v0.0.8/go.mod h1:41BPb192NoK9CYjNB8BAE1J2MtiI/5aq0Wtas5O7A7Q=
249+
github.com/ethersphere/batch-archive v0.0.9 h1:lhVbwHmbngJgwXq3gtRCpxkICghPqSrDVy0WIiR6QGM=
250+
github.com/ethersphere/batch-archive v0.0.9/go.mod h1:41BPb192NoK9CYjNB8BAE1J2MtiI/5aq0Wtas5O7A7Q=
251251
github.com/ethersphere/go-price-oracle-abi v0.6.9 h1:bseen6he3PZv5GHOm+KD6s4awaFmVSD9LFx+HpB6rCU=
252252
github.com/ethersphere/go-price-oracle-abi v0.6.9/go.mod h1:sI/Qj4/zJ23/b1enzwMMv0/hLTpPNVNacEwCWjo6yBk=
253253
github.com/ethersphere/go-storage-incentives-abi v0.9.4 h1:mSIWXQXg5OQmH10QvXMV5w0vbSibFMaRlBL37gPLTM0=

openapi/Swarm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
openapi: 3.0.3
22

33
info:
4-
version: 9.0.0
4+
version: 8.2.0
55
title: Bee API
66
description: "API endpoints for interacting with the Swarm network, supporting file operations, messaging, and node management"
77

pkg/p2p/libp2p/libp2p_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ func newService(t *testing.T, networkID uint64, o libp2pServiceOpts) (s *libp2p.
5555
t.Fatal(err)
5656
}
5757

58-
addr := ":0"
58+
// Bind loopback only so host.Addrs() stays small and independent of the
59+
// machine's docker/bridge NICs. Handshake truncates underlays to
60+
// maxUnderlaysPerPeer; listening on :0 expands to every local interface
61+
// and breaks addressbook equality checks on hosts with many addresses.
62+
addr := "127.0.0.1:0"
5963

6064
if o.Logger == nil {
6165
o.Logger = log.Noop

0 commit comments

Comments
 (0)