Skip to content

Add hardwareId support #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-go-dependencies-task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Check Go Dependencies

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

# See: https://docs.github.com/actions/using-workflows/events-that-trigger-workflows
on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-go-task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Check Go

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

# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
on:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: github.com/arduino/go-paths-helper
version: v1.6.1
version: v1.8.0
type: go
summary:
homepage: https://pkg.go.dev/github.com/arduino/go-paths-helper
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: github.com/arduino/go-properties-orderedmap
version: v1.6.0
version: v1.7.1
type: go
summary: Package properties is a library for handling maps of hierarchical properties.
homepage: https://pkg.go.dev/github.com/arduino/go-properties-orderedmap
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
---
name: github.com/arduino/pluggable-discovery-protocol-handler/v2
version: v2.0.2
version: v2.1.0
type: go
summary: Package discovery is a library for handling the Arduino Pluggable-Discovery
protocol (https://github.com/arduino/tooling-rfcs/blob/main/RFCs/0002-pluggable-discovery.md#pluggable-discovery-api-via-stdinstdout)
The library implements the state machine and the parsing logic to communicate with
a pluggable-discovery client.
homepage: https://pkg.go.dev/github.com/arduino/pluggable-discovery-protocol-handler/v2
license: gpl-3.0-only
licenses:
Expand Down

This file was deleted.

6 changes: 3 additions & 3 deletions .licenses/serial-discovery/go/golang.org/x/sys/unix.dep.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: golang.org/x/sys/unix
version: v0.0.0-20220829200755-d48e67d00261
version: v0.5.0
type: go
summary: Package unix contains an interface to the low-level operating system primitives.
homepage: https://pkg.go.dev/golang.org/x/sys/unix
license: bsd-3-clause
licenses:
- sources: sys@v0.0.0-20220829200755-d48e67d00261/LICENSE
- sources: sys@v0.5.0/LICENSE
text: |
Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -35,7 +35,7 @@ licenses:
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- sources: sys@v0.0.0-20220829200755-d48e67d00261/PATENTS
- sources: sys@v0.5.0/PATENTS
text: |
Additional IP Rights Grant (Patents)

Expand Down
32 changes: 2 additions & 30 deletions DistTasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ version: "3"

vars:
CONTAINER: "docker.elastic.co/beats-dev/golang-crossbuild"
GO_VERSION: "1.16.4"
GO_VERSION: "1.19.3"

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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The `serial-discovery` tool is a command line program that interacts via stdio.

## How to build

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

## Usage

Expand Down
14 changes: 10 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
module github.com/arduino/serial-discovery

go 1.19

require (
github.com/arduino/go-properties-orderedmap v1.6.0
github.com/arduino/pluggable-discovery-protocol-handler/v2 v2.0.2
github.com/arduino/go-properties-orderedmap v1.7.1
github.com/arduino/pluggable-discovery-protocol-handler/v2 v2.1.0
github.com/s-urbaniak/uevent v1.0.1
go.bug.st/serial v1.5.0
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261
golang.org/x/sys v0.5.0
)

go 1.16
require (
github.com/arduino/go-paths-helper v1.8.0 // indirect
github.com/creack/goselect v0.1.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
)
Loading