Skip to content

Commit 9b71b43

Browse files
authored
Merge pull request #60 from arduino/add_hw_id
Add `hardwareId` support
2 parents 4453ccb + 83aaf30 commit 9b71b43

File tree

13 files changed

+69
-145
lines changed

13 files changed

+69
-145
lines changed

.github/workflows/check-go-dependencies-task.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Check Go Dependencies
33

44
env:
55
# See: https://github.com/actions/setup-go/tree/main#supported-version-syntax
6-
GO_VERSION: "1.16"
6+
GO_VERSION: "1.19"
77

88
# See: https://docs.github.com/actions/using-workflows/events-that-trigger-workflows
99
on:

.github/workflows/check-go-task.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Check Go
33

44
env:
55
# See: https://github.com/actions/setup-go/tree/main#supported-version-syntax
6-
GO_VERSION: "1.16"
6+
GO_VERSION: "1.19"
77

88
# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
99
on:

.licenses/serial-discovery/go/github.com/arduino/go-paths-helper.dep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: github.com/arduino/go-paths-helper
3-
version: v1.6.1
3+
version: v1.8.0
44
type: go
55
summary:
66
homepage: https://pkg.go.dev/github.com/arduino/go-paths-helper

.licenses/serial-discovery/go/github.com/arduino/go-properties-orderedmap.dep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: github.com/arduino/go-properties-orderedmap
3-
version: v1.6.0
3+
version: v1.7.1
44
type: go
55
summary: Package properties is a library for handling maps of hierarchical properties.
66
homepage: https://pkg.go.dev/github.com/arduino/go-properties-orderedmap

.licenses/serial-discovery/go/github.com/arduino/pluggable-discovery-protocol-handler/v2.dep.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
---
22
name: github.com/arduino/pluggable-discovery-protocol-handler/v2
3-
version: v2.0.2
3+
version: v2.1.0
44
type: go
55
summary: Package discovery is a library for handling the Arduino Pluggable-Discovery
66
protocol (https://github.com/arduino/tooling-rfcs/blob/main/RFCs/0002-pluggable-discovery.md#pluggable-discovery-api-via-stdinstdout)
7-
The library implements the state machine and the parsing logic to communicate with
8-
a pluggable-discovery client.
97
homepage: https://pkg.go.dev/github.com/arduino/pluggable-discovery-protocol-handler/v2
108
license: gpl-3.0-only
119
licenses:

.licenses/serial-discovery/go/golang.org/x/sys/internal/unsafeheader.dep.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

.licenses/serial-discovery/go/golang.org/x/sys/unix.dep.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
name: golang.org/x/sys/unix
3-
version: v0.0.0-20220829200755-d48e67d00261
3+
version: v0.5.0
44
type: go
55
summary: Package unix contains an interface to the low-level operating system primitives.
66
homepage: https://pkg.go.dev/golang.org/x/sys/unix
77
license: bsd-3-clause
88
licenses:
9-
- sources: sys@v0.0.0-20220829200755-d48e67d00261/LICENSE
9+
- sources: sys@v0.5.0/LICENSE
1010
text: |
1111
Copyright (c) 2009 The Go Authors. All rights reserved.
1212
@@ -35,7 +35,7 @@ licenses:
3535
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3636
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3737
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
38-
- sources: sys@v0.0.0-20220829200755-d48e67d00261/PATENTS
38+
- sources: sys@v0.5.0/PATENTS
3939
text: |
4040
Additional IP Rights Grant (Patents)
4141

DistTasks.yml

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ version: "3"
1919

2020
vars:
2121
CONTAINER: "docker.elastic.co/beats-dev/golang-crossbuild"
22-
GO_VERSION: "1.16.4"
22+
GO_VERSION: "1.19.3"
2323

2424
tasks:
2525
Windows_32bit:
@@ -156,35 +156,7 @@ tasks:
156156
PLATFORM_DIR: "{{.PROJECT_NAME}}_linux_arm_6"
157157
BUILD_COMMAND: "go build -o {{.DIST_DIR}}/{{.PLATFORM_DIR}}/{{.PROJECT_NAME}} {{.LDFLAGS}}"
158158
BUILD_PLATFORM: "linux/armv6"
159-
# We are experiencing the following error with ARMv6 build:
160-
#
161-
# # github.com/arduino/arduino-cli
162-
# net(.text): unexpected relocation type 296 (R_ARM_V4BX)
163-
# panic: runtime error: invalid memory address or nil pointer dereference
164-
# [signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x51ae53]
165-
#
166-
# goroutine 1 [running]:
167-
# cmd/link/internal/loader.(*Loader).SymName(0xc000095c00, 0x0, 0xc0000958d8, 0x5a0ac)
168-
# /usr/local/go/src/cmd/link/internal/loader/loader.go:684 +0x53
169-
# cmd/link/internal/ld.dynrelocsym2(0xc000095880, 0x5a0ac)
170-
# /usr/local/go/src/cmd/link/internal/ld/data.go:777 +0x295
171-
# cmd/link/internal/ld.(*dodataState).dynreloc2(0xc007df9800, 0xc000095880)
172-
# /usr/local/go/src/cmd/link/internal/ld/data.go:794 +0x89
173-
# cmd/link/internal/ld.(*Link).dodata2(0xc000095880, 0xc007d00000, 0x60518, 0x60518)
174-
# /usr/local/go/src/cmd/link/internal/ld/data.go:1434 +0x4d4
175-
# cmd/link/internal/ld.Main(0x8729a0, 0x4, 0x8, 0x1, 0xd, 0xe, 0x0, 0x0, 0x6d7737, 0x12, ...)
176-
# /usr/local/go/src/cmd/link/internal/ld/main.go:302 +0x123a
177-
# main.main()
178-
# /usr/local/go/src/cmd/link/main.go:68 +0x1dc
179-
# Error: failed building for linux/armv6: exit status 2
180-
#
181-
# This seems to be a problem in the go builder 1.16.x that removed support for the R_ARM_V4BX instruction:
182-
# https://github.com/golang/go/pull/44998
183-
# https://groups.google.com/g/golang-codereviews/c/yzN80xxwu2E
184-
#
185-
# Until there is a fix released we must use a recent gcc for Linux_ARMv6 build, so for this
186-
# build we select the debian10 based container.
187-
CONTAINER_TAG: "{{.GO_VERSION}}-armel-debian10"
159+
CONTAINER_TAG: "{{.GO_VERSION}}-armel-debian9"
188160
PACKAGE_PLATFORM: "Linux_ARMv6"
189161
PACKAGE_NAME: "{{.PROJECT_NAME}}_{{.VERSION}}_{{.PACKAGE_PLATFORM}}.tar.gz"
190162

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The `serial-discovery` tool is a command line program that interacts via stdio.
44

55
## How to build
66

7-
Install a recent go environment (>=13.0) and run `go build`. The executable `serial-discovery` will be produced in your working directory.
7+
Install a recent golang environment and run `go build`. The executable `serial-discovery` will be produced in your working directory.
88

99
## Usage
1010

go.mod

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
module github.com/arduino/serial-discovery
22

3+
go 1.19
4+
35
require (
4-
github.com/arduino/go-properties-orderedmap v1.6.0
5-
github.com/arduino/pluggable-discovery-protocol-handler/v2 v2.0.2
6+
github.com/arduino/go-properties-orderedmap v1.7.1
7+
github.com/arduino/pluggable-discovery-protocol-handler/v2 v2.1.0
68
github.com/s-urbaniak/uevent v1.0.1
79
go.bug.st/serial v1.5.0
8-
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261
10+
golang.org/x/sys v0.5.0
911
)
1012

11-
go 1.16
13+
require (
14+
github.com/arduino/go-paths-helper v1.8.0 // indirect
15+
github.com/creack/goselect v0.1.2 // indirect
16+
github.com/pkg/errors v0.9.1 // indirect
17+
)

0 commit comments

Comments
 (0)