Skip to content

Commit 1132d0f

Browse files
committed
Merge branch 'main' into chore/repo-rename-teoslayer-to-pilot-protocol
Resolve conflicts preserving the restored PilotEmbeddedStart embedded API and the org rename, while taking main's newer dependency versions. - go.mod: union of requires; keep common v0.5.5 (no downgrade to v0.4.8), keep handshake/policy as direct deps used by PilotEmbeddedStart; go directive bumped to 1.25.11 via go mod tidy (sibling drift). - embedded.go: keep crypto/handshake/policy imports needed by the restored PilotEmbeddedStart; gofmt the daemon.Config struct alignment. - .github/workflows/ci.yml: keep main's CI plus the pilot-protocol rename.
2 parents 8d80e34 + 9815670 commit 1132d0f

3 files changed

Lines changed: 25 additions & 25 deletions

File tree

.github/workflows/ci.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,102 +14,102 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout this repo
17-
uses: actions/checkout@v6
17+
uses: actions/checkout@v7
1818
with:
1919
path: libpilot
2020

2121
- name: Checkout web4
22-
uses: actions/checkout@v6
22+
uses: actions/checkout@v7
2323
with:
2424
repository: pilot-protocol/pilotprotocol
2525
path: web4
2626

2727
- name: Checkout common
28-
uses: actions/checkout@v6
28+
uses: actions/checkout@v7
2929
with:
3030
repository: pilot-protocol/common
3131
path: common
3232

3333
- name: Checkout trustedagents
34-
uses: actions/checkout@v6
34+
uses: actions/checkout@v7
3535
with:
3636
repository: pilot-protocol/trustedagents
3737
path: trustedagents
3838

3939
- name: Checkout handshake
40-
uses: actions/checkout@v6
40+
uses: actions/checkout@v7
4141
with:
4242
repository: pilot-protocol/handshake
4343
path: handshake
4444

4545
- name: Checkout policy
46-
uses: actions/checkout@v6
46+
uses: actions/checkout@v7
4747
with:
4848
repository: pilot-protocol/policy
4949
path: policy
5050

5151
- name: Checkout runtime
52-
uses: actions/checkout@v6
52+
uses: actions/checkout@v7
5353
with:
5454
repository: pilot-protocol/runtime
5555
path: runtime
5656

5757
- name: Checkout skillinject
58-
uses: actions/checkout@v6
58+
uses: actions/checkout@v7
5959
with:
6060
repository: pilot-protocol/skillinject
6161
path: skillinject
6262

6363
- name: Checkout webhook
64-
uses: actions/checkout@v6
64+
uses: actions/checkout@v7
6565
with:
6666
repository: pilot-protocol/webhook
6767
path: webhook
6868

6969
- name: Checkout eventstream
70-
uses: actions/checkout@v6
70+
uses: actions/checkout@v7
7171
with:
7272
repository: pilot-protocol/eventstream
7373
path: eventstream
7474

7575
- name: Checkout dataexchange
76-
uses: actions/checkout@v6
76+
uses: actions/checkout@v7
7777
with:
7878
repository: pilot-protocol/dataexchange
7979
path: dataexchange
8080

8181
- name: Checkout updater
82-
uses: actions/checkout@v6
82+
uses: actions/checkout@v7
8383
with:
8484
repository: pilot-protocol/updater
8585
path: updater
8686

8787
- name: Checkout gateway
88-
uses: actions/checkout@v6
88+
uses: actions/checkout@v7
8989
with:
9090
repository: pilot-protocol/gateway
9191
path: gateway
9292

9393
- name: Checkout nameserver
94-
uses: actions/checkout@v6
94+
uses: actions/checkout@v7
9595
with:
9696
repository: pilot-protocol/nameserver
9797
path: nameserver
9898

9999
- name: Checkout rendezvous
100-
uses: actions/checkout@v6
100+
uses: actions/checkout@v7
101101
with:
102102
repository: pilot-protocol/rendezvous
103103
path: rendezvous
104104

105105
- name: Checkout beacon
106-
uses: actions/checkout@v6
106+
uses: actions/checkout@v7
107107
with:
108108
repository: pilot-protocol/beacon
109109
path: beacon
110110

111111
- name: Checkout app-store
112-
uses: actions/checkout@v6
112+
uses: actions/checkout@v7
113113
with:
114114
repository: pilot-protocol/app-store
115115
path: app-store

embedded.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ func PilotEmbeddedStart(configJSON *C.char) *C.char {
109109
identityPath := filepath.Join(cfg.DataDir, "identity.json")
110110

111111
d := daemon.New(daemon.Config{
112-
RegistryAddr: cfg.RegistryAddr,
113-
BeaconAddr: cfg.BeaconAddr,
114-
SocketPath: cfg.SocketPath,
115-
IdentityPath: identityPath,
116-
TrustAutoApprove: cfg.TrustAutoApprove,
112+
RegistryAddr: cfg.RegistryAddr,
113+
BeaconAddr: cfg.BeaconAddr,
114+
SocketPath: cfg.SocketPath,
115+
IdentityPath: identityPath,
116+
TrustAutoApprove: cfg.TrustAutoApprove,
117117
KeepaliveInterval: time.Duration(cfg.KeepaliveSec) * time.Second,
118-
Version: cfg.Version,
119-
Encrypt: true,
118+
Version: cfg.Version,
119+
Encrypt: true,
120120
})
121121

122122
dapi := d.DaemonAPI()

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/pilot-protocol/libpilot
22

3-
go 1.25.10
3+
go 1.25.11
44

55
require (
66
github.com/pilot-protocol/common v0.5.5

0 commit comments

Comments
 (0)