Skip to content

Commit 032af6d

Browse files
paralinparalin
committed
chore: update deps and license years
Signed-off-by: Christian Stewart <[email protected]>
1 parent 707ac6b commit 032af6d

File tree

12 files changed

+780
-946
lines changed

12 files changed

+780
-946
lines changed

‎.github/workflows/codeql-analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
language: [ 'go', 'javascript' ]
28-
go: ['1.23']
29-
node: [22.x]
28+
go: ['1.24']
29+
node: [23.x]
3030
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
3131
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
3232

‎.github/workflows/tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
go: ['1.23']
20-
node: [22.x]
19+
go: ['1.24']
20+
node: [23.x]
2121
timeout-minutes: 10
2222
steps:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

‎LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Copyright (c) 2018-2024 Aperture Robotics, LLC.
2-
Copyright (c) 2018-2024 Christian Stewart <[email protected]>
1+
Copyright (c) 2018-2025 Aperture Robotics, LLC.
2+
Copyright (c) 2018-2025 Christian Stewart <[email protected]>
33

44
Permission is hereby granted, free of charge, to any person obtaining a copy
55
of this software and associated documentation files (the "Software"), to deal

‎bus/api/api_srpc.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/plugin-demo/go.mod

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/aperturerobotics/controllerbus/example/plugin-demo
22

3-
go 1.23
3+
go 1.24
44

5-
toolchain go1.23.5
5+
toolchain go1.24.0
66

77
replace github.com/aperturerobotics/controllerbus => ../..
88

@@ -13,7 +13,7 @@ require (
1313
github.com/aperturerobotics/controllerbus v0.49.0 // master
1414
github.com/aperturerobotics/protobuf-go-lite v0.8.0 // latest
1515
github.com/aperturerobotics/starpc v0.36.2-0.20241223085748-77ec8d462920 // indirect; main
16-
github.com/aperturerobotics/util v1.27.1 // indirect; latest
16+
github.com/aperturerobotics/util v1.29.0 // indirect; latest
1717
)
1818

1919
require (
@@ -49,11 +49,11 @@ require (
4949
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
5050
github.com/zeebo/blake3 v0.2.4 // indirect
5151
golang.org/x/crypto v0.31.0 // indirect
52-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
53-
golang.org/x/mod v0.22.0 // indirect
54-
golang.org/x/sync v0.10.0 // indirect
55-
golang.org/x/sys v0.28.0 // indirect
56-
golang.org/x/tools v0.28.0 // indirect
52+
golang.org/x/exp v0.0.0-20250228200357-dead58393ab7 // indirect
53+
golang.org/x/mod v0.23.0 // indirect
54+
golang.org/x/sync v0.11.0 // indirect
55+
golang.org/x/sys v0.30.0 // indirect
56+
golang.org/x/tools v0.30.0 // indirect
5757
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
5858
gopkg.in/yaml.v2 v2.4.0 // indirect
5959
lukechampine.com/blake3 v1.3.0 // indirect

‎example/plugin-demo/go.sum

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ github.com/aperturerobotics/protobuf-go-lite v0.8.0 h1:SoiTAVArmOrNTX31e6CC5Bem6
66
github.com/aperturerobotics/protobuf-go-lite v0.8.0/go.mod h1:y49wVEezRHg78uQ2OzLLZbtTTWuox+ChmaTuh6FLJW8=
77
github.com/aperturerobotics/starpc v0.36.2-0.20241223085748-77ec8d462920 h1:J2QdJlnvuGzj6lWE6DsIwRonSv+9mPMFWTVjX/VKQUg=
88
github.com/aperturerobotics/starpc v0.36.2-0.20241223085748-77ec8d462920/go.mod h1:DBO0ym5Wrt6WiyblRMz6TSvXVEi7N+QCmfqMqenUsdU=
9-
github.com/aperturerobotics/util v1.27.1 h1:htCjY/HvP8DusRxWiCFEbm8lMz7HzJSovdhSzVcrtuI=
10-
github.com/aperturerobotics/util v1.27.1/go.mod h1:hurmxv5jC2CqkfhgySRYrXDcvqPk6BHUhHizu6yyXhE=
9+
github.com/aperturerobotics/util v1.29.0 h1:Yu4uP1ZnBMmSLgpKRW9FCu0yJpbKexhFE12jIFXVTIs=
10+
github.com/aperturerobotics/util v1.29.0/go.mod h1:yG6DwiEHZ79CqoPX9ZEkcSQA6NNMf+vBgf+3b1QOn8A=
1111
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
1212
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
1313
github.com/coder/websocket v1.8.13-0.20240912160150-6c8e3ab3985f h1:izqVn8o6O+hpoOHPHOtegczwcT4wyHk1gsa6hw3vFow=
@@ -87,18 +87,18 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
8787
github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
8888
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
8989
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
90-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
91-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
92-
golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
93-
golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
94-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
95-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
90+
golang.org/x/exp v0.0.0-20250228200357-dead58393ab7 h1:aWwlzYV971S4BXRS9AmqwDLAD85ouC6X+pocatKY58c=
91+
golang.org/x/exp v0.0.0-20250228200357-dead58393ab7/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk=
92+
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
93+
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
94+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
95+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
9696
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
9797
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
98-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
99-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
100-
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
101-
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
98+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
99+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
100+
golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
101+
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
102102
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
103103
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
104104
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎go.mod

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module github.com/aperturerobotics/controllerbus
22

3-
go 1.23
3+
go 1.24
44

5-
toolchain go1.23.5
5+
toolchain go1.24.0
66

77
// This fork drops ecdsa, drops secp256k1, adds eddilithium2 and eddilithium3
88
replace github.com/libp2p/go-libp2p => github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0 // aperture
99

1010
replace github.com/libp2p/go-msgio => github.com/aperturerobotics/go-libp2p-msgio v0.0.0-20240511033615-1b69178aa5c8 // aperture
1111

1212
require (
13-
github.com/aperturerobotics/common v0.20.3 // latest
13+
github.com/aperturerobotics/common v0.21.1 // latest
1414
github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20241223092408-d525fa878b3e // latest
1515
github.com/aperturerobotics/protobuf-go-lite v0.8.0 // latest
1616
github.com/aperturerobotics/starpc v0.36.1 // latest
17-
github.com/aperturerobotics/util v1.27.1 // latest
17+
github.com/aperturerobotics/util v1.29.0 // latest
1818
)
1919

2020
require (
@@ -27,9 +27,9 @@ require (
2727
github.com/sirupsen/logrus v1.9.3
2828
github.com/urfave/cli/v2 v2.27.5
2929
github.com/zeebo/blake3 v0.2.4
30-
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c
31-
golang.org/x/mod v0.22.0
32-
golang.org/x/tools v0.29.0
30+
golang.org/x/exp v0.0.0-20250228200357-dead58393ab7
31+
golang.org/x/mod v0.23.0
32+
golang.org/x/tools v0.30.0
3333
mvdan.cc/gofumpt v0.7.0
3434
)
3535

@@ -54,8 +54,8 @@ require (
5454
github.com/spaolacci/murmur3 v1.1.1-0.20190317074736-539464a789e9 // indirect
5555
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
5656
golang.org/x/crypto v0.31.0 // indirect
57-
golang.org/x/sync v0.10.0 // indirect
58-
golang.org/x/sys v0.29.0 // indirect
57+
golang.org/x/sync v0.11.0 // indirect
58+
golang.org/x/sys v0.30.0 // indirect
5959
gopkg.in/yaml.v2 v2.4.0 // indirect
6060
lukechampine.com/blake3 v1.3.0 // indirect
6161
)

‎go.sum

+14-22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/aperturerobotics/common v0.20.3 h1:pzcwAbLdyC4sgHOquGTkwK1ww/LlPscxiNpJ3u0Upg8=
2-
github.com/aperturerobotics/common v0.20.3/go.mod h1:S2yc+bp5PoLn0PHOAt+XXGsC50sA0MU9GF3q6FyEs9U=
1+
github.com/aperturerobotics/common v0.21.1 h1:n2kPPTVhTkNeJ5pDeH6u3tMuv07A53bek/TRMGNZIAs=
2+
github.com/aperturerobotics/common v0.21.1/go.mod h1:FrecdNcsYvVS8RcWCR8FUkKFh+XmouFOYKHpBdMqqBA=
33
github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0 h1:tGwbeDoEeQCrUQL+ClUywldqvz9eRmhcVrGwGxz2xJg=
44
github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0/go.mod h1:FJkAtQcP9XxqG1NNLNHKm+wLVIGSCQX2s6CEoD+w97g=
55
github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20241223092408-d525fa878b3e h1:9KDK70CSnHCUGShpq3sEg/t8zEEnKePlhJ4775ekpeI=
@@ -8,8 +8,8 @@ github.com/aperturerobotics/protobuf-go-lite v0.8.0 h1:SoiTAVArmOrNTX31e6CC5Bem6
88
github.com/aperturerobotics/protobuf-go-lite v0.8.0/go.mod h1:y49wVEezRHg78uQ2OzLLZbtTTWuox+ChmaTuh6FLJW8=
99
github.com/aperturerobotics/starpc v0.36.1 h1:10z0U0gPsXbT6eHGExa/oblWwWSC4yO39T6fdDpsKL4=
1010
github.com/aperturerobotics/starpc v0.36.1/go.mod h1:VOTQt8NRyo+HbcTpf+YAonYU4gofyPZyYsX/B9NUpj8=
11-
github.com/aperturerobotics/util v1.27.1 h1:htCjY/HvP8DusRxWiCFEbm8lMz7HzJSovdhSzVcrtuI=
12-
github.com/aperturerobotics/util v1.27.1/go.mod h1:hurmxv5jC2CqkfhgySRYrXDcvqPk6BHUhHizu6yyXhE=
11+
github.com/aperturerobotics/util v1.29.0 h1:Yu4uP1ZnBMmSLgpKRW9FCu0yJpbKexhFE12jIFXVTIs=
12+
github.com/aperturerobotics/util v1.29.0/go.mod h1:yG6DwiEHZ79CqoPX9ZEkcSQA6NNMf+vBgf+3b1QOn8A=
1313
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
1414
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
1515
github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
@@ -93,26 +93,18 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
9393
github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
9494
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
9595
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
96-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
97-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
98-
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA=
99-
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
100-
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc=
101-
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
102-
golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
103-
golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
104-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
105-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
96+
golang.org/x/exp v0.0.0-20250228200357-dead58393ab7 h1:aWwlzYV971S4BXRS9AmqwDLAD85ouC6X+pocatKY58c=
97+
golang.org/x/exp v0.0.0-20250228200357-dead58393ab7/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk=
98+
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
99+
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
100+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
101+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
106102
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
107103
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
108-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
109-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
110-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
111-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
112-
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
113-
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
114-
golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
115-
golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
104+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
105+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
106+
golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
107+
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
116108
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
117109
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
118110
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
"singleQuote": true
4444
},
4545
"devDependencies": {
46-
"@aptre/common": "^0.20.0",
46+
"@aptre/common": "^0.21.1",
4747
"depcheck": "^1.4.7",
48-
"prettier": "^3.0.1",
48+
"prettier": "^3.5.3",
4949
"rimraf": "^6.0.1",
50-
"typescript": "^5.4.5"
50+
"typescript": "^5.8.2"
5151
},
5252
"dependencies": {
5353
"@aptre/protobuf-es-lite": "^0.4.4",
54-
"starpc": "^0.36.0"
54+
"starpc": "^0.37.0"
5555
},
5656
"resolutions": {
5757
"@aptre/protobuf-es-lite": "0.4.8"

‎plugin/compiler/compiler.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package plugin_compiler
22

33
import (
4+
"context"
45
"crypto/sha256"
56
gast "go/ast"
67
"go/build"
@@ -23,6 +24,7 @@ const (
2324
//
2425
// {buildHash} will be replaced with the build hash in the output filename.
2526
func CompilePluginFromFile(
27+
ctx context.Context,
2628
le *logrus.Entry,
2729
gfile *gast.File,
2830
intermediateGoFile string,
@@ -56,7 +58,7 @@ func CompilePluginFromFile(
5658
// second time with the plugin path including the hash.
5759

5860
// go 1.16: to generate go.sum files, it's now necessary to run this explicitly
59-
ecmd := exec.NewCmd("go", "mod", "tidy")
61+
ecmd := exec.NewCmd(ctx, "go", "mod", "tidy")
6062
le.
6163
WithField("work-dir", ecmd.Dir).
6264
Debugf("running go mod tidy: %s", ecmd.String())
@@ -67,6 +69,7 @@ func CompilePluginFromFile(
6769
// start the go compiler execution #1
6870
intermediateOutFile1 := path.Join(tmpName, "pass-1.cbus.so")
6971
ecmd = exec.NewCmd(
72+
ctx,
7073
"go",
7174
"build", "-v",
7275
"-buildmode=plugin",
@@ -116,6 +119,7 @@ func CompilePluginFromFile(
116119
// start the go compiler execution #2
117120
intermediateOutFile2 := path.Join(tmpName, "pass-2.cbus.so")
118121
ecmd = exec.NewCmd(
122+
ctx,
119123
"go",
120124
"build", "-v", "-trimpath",
121125
"-buildmode=plugin",

‎plugin/compiler/module-compiler.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ func (m *ModuleCompiler) CompilePlugin(outFile string) error {
457457
defer os.RemoveAll(tmpName)
458458

459459
// go 1.16: to generate go.sum files, it's now necessary to run this explicitly
460-
ecmd := exec.NewCmd("go", "mod", "tidy")
460+
ecmd := exec.NewCmd(m.ctx, "go", "mod", "tidy")
461461
ecmd.Dir = pluginDirAbs
462462
le.
463463
WithField("work-dir", ecmd.Dir).
@@ -468,6 +468,7 @@ func (m *ModuleCompiler) CompilePlugin(outFile string) error {
468468

469469
// start the go compiler execution
470470
ecmd = exec.NewCmd(
471+
m.ctx,
471472
"go",
472473
"build", "-v", "-trimpath",
473474
"-buildmode=plugin",

0 commit comments

Comments
 (0)